diff --git a/.gitignore b/.gitignore
index ec4e67f05..3a3043e3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,11 @@ lock
 registered_data.ini
 .vs/
 
+docs/_site/
+docs/_repo/
+docs/metadata/
+tools/
+
 # quickbuild.exe
 /VersionGeneratingLogs/
 QLogs
diff --git a/docs/contributing.md b/CONTRIBUTING.md
similarity index 100%
rename from docs/contributing.md
rename to CONTRIBUTING.md
diff --git a/docs/api/index.md b/docs/api/index.md
new file mode 100644
index 000000000..a845c1d66
--- /dev/null
+++ b/docs/api/index.md
@@ -0,0 +1,28 @@
+# API Reference
+
+The .NET API for PowerShell Editor Services is organized in a way that allows
+you to easily get started using all of its services but also giving you the
+option to only use the services you care about in your application.
+
+The best starting point is the @Microsoft.PowerShell.EditorServices.EditorSession
+class which can start up all of the following services for use in a single editing
+session.
+
+Use the @Microsoft.PowerShell.EditorServices.LanguageService to provide language
+intelligence behaviors like finding the references or definition of a cmdlet or variable.
+
+Use the @Microsoft.PowerShell.EditorServices.AnalysisService to provide rule-based
+analysis of scripts using [PowerShell Script Analyzer](https://github.com/PowerShell/PSScriptAnalyzer).
+
+Use the @Microsoft.PowerShell.EditorServices.DebugService to easily interact with
+the PowerShell debugger.
+
+Use the @Microsoft.PowerShell.EditorServices.Console.ConsoleService to provide interactive
+console support in the user's editor.
+
+Use the @Microsoft.PowerShell.EditorServices.Extensions.ExtensionService to allow
+the user to extend the host editor with new capabilities using PowerShell code.
+
+The core of all the services is the @Microsoft.PowerShell.EditorServices.PowerShellContext
+class.  This class manages a session's runspace and handles script and command
+execution no matter what state the runspace is in.
\ No newline at end of file
diff --git a/docs/docfx.json b/docs/docfx.json
new file mode 100644
index 000000000..8b743686e
--- /dev/null
+++ b/docs/docfx.json
@@ -0,0 +1,69 @@
+{
+  "metadata": [
+    {
+      "src": [
+        {
+          "files": [ "*.csproj" ],
+          "cwd": "../src/PowerShellEditorServices",
+          "exclude": [ "**/obj/**", "**/bin/**" ]
+        }
+      ],
+      "dest": "metadata/api"
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "cwd": "metadata/api",
+        "files": [
+          "**/**.yml"
+        ],
+        "dest": "api"
+      },
+      {
+        "cwd": "../",
+        "files": [
+          "CONTRIBUTING.md",
+          "CHANGELOG.md"
+        ]
+      },
+      {
+        "cwd":  ".",
+        "files": [
+          "toc.yml",
+          "index.md",
+          "api/index.md",
+          "guide/**.md"
+        ],
+        "exclude": [
+          "metadata/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "overwrite": [
+      {
+        "files": [
+          "apidoc/**.md"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "dest": "_site",
+    "template": [ "default", "template" ]
+  }
+}
\ No newline at end of file
diff --git a/docs/extensions.md b/docs/extensions.md
deleted file mode 100644
index 13c0a9153..000000000
--- a/docs/extensions.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# PowerShell Editor Services Extensibility Model
-
-PowerShell Editor Services exposes a common extensibility model which allows
-a user to write extension code in PowerShell that works across any editor that
-uses PowerShell Editor Services.
-
-## Using Extensions
-
-**TODO**
-
-- Enable-EditorExtension -Name "SomeExtension.CustomAnalyzer"
-- Disable-EditorExtension -Name "SomeExtension.CustomAnalyzer"
-
-## Writing Extensions
-
-Here are some examples of writing editor extensions:
-
-### Command Extensions
-
-#### Executing a cmdlet or function
-
-```powershell
-function MyExtensionFunction {
-    Write-Output "My extension function was invoked!"
-}
-
-Register-EditorExtension `
-    -Command
-    -Name "MyExt.MyExtensionFunction" `
-    -DisplayName "My extension function" `
-    -Function MyExtensionFunction
-```
-
-#### Executing a script block
-
-```powershell
-Register-EditorExtension `
-    -Command
-    -Name "MyExt.MyExtensionScriptBlock" `
-    -DisplayName "My extension script block" `
-    -ScriptBlock { Write-Output "My extension script block was invoked!" }
-```
-
-#### Additional Parameters
-
-##### ExecuteInSession [switch]
-
-Causes the command to be executed in the user's current session.  By default,
-commands are executed in a global session that isn't affected by script
-execution.  Adding this parameter will cause the command to be executed in the
-context of the user's session.
-
-### Analyzer Extensions
-
-```powershell
-function Invoke-MyAnalyzer {
-    param(
-        $FilePath,
-        $Ast,
-        $StartLine,
-        $StartColumn,
-        $EndLine,
-        $EndColumn
-    )
-}
-
-Register-EditorExtension `
-    -Analyzer
-    -Name "MyExt.MyAnalyzer" `
-    -DisplayName "My analyzer extension" `
-    -Function Invoke-MyAnalyzer
-```
-
-#### Additional Parameters
-
-##### DelayInterval [int]
-
-Specifies the interval after which this analyzer will be run when the
-user finishes typing in the script editor.
-
-### Formatter Extensions
-
-```powershell
-function Invoke-MyFormatter {
-    param(
-        $FilePath,
-        $ScriptText,
-        $StartLine,
-        $StartColumn,
-        $EndLine,
-        $EndColumn
-    )
-}
-
-Register-EditorExtension `
-    -Formatter
-    -Name "MyExt.MyFormatter" `
-    -DisplayName "My formatter extension" `
-    -Function Invoke-MyFormatter
-```
-
-#### Additional Parameters
-
-##### SupportsSelections [switch]
-
-Indicates that this formatter extension can format selections in a larger
-file rather than formatting the entire file.  If this parameter is not
-specified then the entire file will be sent to the extension for every
-call.
-
-## Examples
-
diff --git a/docs/guide/extensions.md b/docs/guide/extensions.md
new file mode 100644
index 000000000..cfe5290c9
--- /dev/null
+++ b/docs/guide/extensions.md
@@ -0,0 +1,168 @@
+# Extending the Host Editor
+
+PowerShell Editor Services exposes a common extensibility model which allows
+you to write extension code in PowerShell that works across any editor that
+uses PowerShell Editor Services.
+
+## API Overview
+
+### Introducing `$psEditor`
+
+The entry point for the PowerShell Editor Services extensibility model is the `$psEditor`
+object of the type @Microsoft.PowerShell.EditorServices.Extensions.EditorObject. For
+those familiar with the PowerShell ISE's `$psISE` object, the `$psEditor` object is very
+similar.  The primary difference is that this model has been generalized to work against
+any editor which leverages PowerShell Editor Services for its PowerShell editing experience.
+
+> NOTE: For now the `$psEditor` object is limited as it has just been
+> introduced.  If you have ideas for other useful APIs it could expose
+> please file an issue on our GitHub page.
+
+This object gives access to all of the high-level services in the current
+editing session.  For example, the @Microsoft.PowerShell.EditorServices.Extensions.EditorObject.Workspace
+property gives access to the editor's workspace, allowing you to create or open files
+in the editor.
+
+### Usage Examples
+
+#### Opening a file in the editor
+
+```powershell
+# Open the current user's profile for this editor
+$psEditor.Workspace.OpenFile($profile)
+```
+
+#### Manipulating the user's active file buffer
+
+```powershell
+# Insert new text replacing the user's current selection
+$context = $psEditor.GetEditorContext()
+$context.InsertText("# All your script are belong to us", $context.SelectedRange)
+```
+
+#### Setting the selection based on the cursor position
+
+```powershell
+# Set the selection from their cursor position to the end of the same line
+$context = $psEditor.GetEditorContext()
+$context.SetSelection($context.CursorPosition, $context.CursorPosition.GetLineEnd())
+```
+
+## Registering Editor Commands
+
+The `$psEditor` object gives you the ability to write a script that can automate the
+host editor when run inside of it.  However, you may not want to give a user a plain
+script that performs some operation.  What if you'd prefer to add a new command to the
+editor which can execute your code when the user invokes it?  The `Register-EditorCommand`
+cmdlet allows you to register either a function, cmdlet, or ScriptBlock as a
+command in the host editor.
+
+### Registering a cmdlet or function command
+
+```powershell
+function Invoke-MyCommand {
+    Write-Output "My command's function was invoked!"
+}
+
+Register-EditorCommand `
+    -Name "MyModule.MyCommandWithFunction" `
+    -DisplayName "My command with function" `
+    -Function Invoke-MyCommand
+```
+
+### Registering a script block command
+
+```powershell
+Register-EditorCommand `
+    -Name "MyModule.MyCommandWithScriptBlock" `
+    -DisplayName "My command with script block" `
+    -ScriptBlock { Write-Output "My command's script block was invoked!" }
+```
+
+### The @Microsoft.PowerShell.EditorServices.Extensions.EditorContext parameter
+
+Your function, cmdlet, or ScriptBlock can optionally accept a single parameter
+of type @Microsoft.PowerShell.EditorServices.Extensions.EditorContext which provides
+information about the state of the host editor at the time your command was
+invoked.  With this object you can easily perform operations like manipulatin the
+state of the user's active editor buffer or changing the current selection.
+
+The usual convention is that a `$context` parameter is added to your editor
+command's function.  For now it is recommended that you fully specify the
+type of the @Microsoft.PowerShell.EditorServices.Extensions.EditorContext object
+so that you get full IntelliSense on your context parameter.
+
+Here is an example of using the `$context` parameter:
+
+```powershell
+Register-EditorCommand `
+    -Name "MyModule.MyEditorCommandWithContext" `
+    -DisplayName "My command with context usage" `
+    -ScriptBlock {
+        param([Microsoft.PowerShell.EditorServices.Extensions.EditorContext]$context)
+        Write-Output "The user's cursor is on line $($context.CursorPosition.Line)!"
+    }
+```
+
+### Suppressing command output
+
+If you would like for your editor command to run without its output being
+written to the user's console, you can use the `-SuppressOutput` switch
+parameter of the `Register-EditorCommand` cmdlet.  We recommend that you
+use this parameter if your command does not need to write output to the
+user's console.
+
+Regardless of whether the `-SuppressOutput` parameter is used, any errors
+that occur while running your editor command will be written to the user's
+console.
+
+## Using Editor Commands
+
+If you've registered an editor command, either through your own code or
+a module that you've installed, you can launch it using your editor's **Show
+additional commands from PowerShell modules** command.  Running this command
+will cause a list of commands to be displayed.
+
+In Visual Studio Code, press `Ctrl+Shift+P` to open the command palette.  Type
+the characters `addi` until you see the following item and then press `Enter`:
+
+![Command palette screenshot](../images/vsc_command_palette.png)
+
+The list that appears next will show all of the editor commands that have
+been registered with PowerShell code.  Selecting one of them will cause its
+function or ScriptBlock to be executed.
+
+![Command list screenshot](../images/vsc_editor_command_list.png)
+
+Other editors should follow a similar pattern, exposing this command list through
+a "Show additional commands" item in the command palette.
+
+> NOTE: In the future we hope to be able to register editor commands at the top level
+> so that these commands are easier to find and so that they also can be bound to
+> hotkeys for quick access.
+
+## Shipping an Extension Module
+
+You can easily ship a module containing editor commands which get registered
+if the module is loaded into an editor session.  Assuming that you've exported
+a function or cmdlet named `Invoke-MyEditorCommand` in your module's psd1
+file, you can add this code at the very end of your module's psm1 file:
+
+```powershell
+if ($psEditor) {
+    Register-EditorCommand `
+        -Name "MyModule.MyEditorCommand" `
+        -DisplayName "My editor command" `
+        -Function Invoke-MyEditorCommand `
+        -SuppressOutput
+}
+```
+
+The user will now be able to import your module in their host editor's profile and
+your editor command will be immediately available after the PowerShell extension
+in that editor starts up.
+
+> NOTE: In the future we plan to provide an easy way for the user to opt-in
+> to the automatic loading of any editor command modules that they've installed
+> from the PowerShell Gallery.  If this interests you, please let us know on
+> [this GitHub issue](https://github.com/PowerShell/PowerShellEditorServices/issues/215).
\ No newline at end of file
diff --git a/docs/guide/introduction.md b/docs/guide/introduction.md
new file mode 100644
index 000000000..4c34a76f2
--- /dev/null
+++ b/docs/guide/introduction.md
@@ -0,0 +1,37 @@
+# Introduction
+
+> NOTE: The user guide is currently under development and may be missing
+> important information.  If you feel that a particular area is missing or
+> poorly explained, please feel free to file an issue at our [GitHub site](https://github.com/PowerShell/PowerShellEditorServices/issues)
+
+PowerShell Editor Services is a tool that provides useful services to code
+editors that need a great PowerShell editing experience.
+
+## The .NET API
+
+The .NET API provides the complete set of services which can be used in
+code editors or any other type of application.  The easiest way to get
+started with it is to add the [Microsoft.PowerShell.EditorServices](https://www.nuget.org/packages/Microsoft.PowerShell.EditorServices/)
+NuGet package to your C# project.
+
+If you're a developer that would like to use PowerShell Editor Services in
+a .NET application, read the page titled [Using the .NET API](using_the_dotnet_api.md)
+to learn more.
+
+## The Host Process
+
+The host process provides a JSON-based API wrapper around the .NET APIs so
+that editors written in non-.NET languages can make use of its capabilities.
+In the future the host process will allow the use of network-based channels
+to enable all of the APIs to be accessed remotely.
+
+If you're a developer that would like to integrate PowerShell Editor Services
+into your favorite editor, read the page titled [Using the Host Process](using_the_host_process.md)
+to learn more.
+
+## Writing Extensions in PowerShell
+
+If you're using an editor that leverages PowerShell Editor Services to provide
+PowerShell editing capabilities, you may be able to extend its behavior using
+our PowerShell-based editor extension API.  Read the page titled [Extending the
+Host Editor](extensions.md) to learn more.
\ No newline at end of file
diff --git a/docs/guide/toc.md b/docs/guide/toc.md
new file mode 100644
index 000000000..0e3441770
--- /dev/null
+++ b/docs/guide/toc.md
@@ -0,0 +1,4 @@
+# [Introduction](introduction.md)
+# [Using the .NET API](using_the_dotnet_api.md)
+# [Using the Host Process](using_the_host_process.md)
+# [Extending the Host Editor](extensions.md)
\ No newline at end of file
diff --git a/docs/guide/using_the_dotnet_api.md b/docs/guide/using_the_dotnet_api.md
new file mode 100644
index 000000000..a8c1aaced
--- /dev/null
+++ b/docs/guide/using_the_dotnet_api.md
@@ -0,0 +1,4 @@
+# Using the PowerShell Editor Services .NET API
+
+> NOTE: This page will eventually provide usage examples of the .NET
+> API.  For now the [API Reference](../api/index.md) is the best starting point.
\ No newline at end of file
diff --git a/docs/using_the_host_process.md b/docs/guide/using_the_host_process.md
similarity index 96%
rename from docs/using_the_host_process.md
rename to docs/guide/using_the_host_process.md
index 20c9d53bd..4485b4cde 100644
--- a/docs/using_the_host_process.md
+++ b/docs/guide/using_the_host_process.md
@@ -3,18 +3,18 @@
 The PowerShell Editor Services host process provides an editor-agnostic interface for
 leveraging the core .NET API.
 
-**WARNING: Some of the information in this file is out of date due to recent protocol
-changes.  The general details in the document still apply but the schema of the language service
-message has changed a lot.  This document will be updated soon with the correct details.**
+> WARNING: Much of the information in this file is out of date due to recent protocol
+> changes.  The general details in the document still apply but the schema of the language service
+> message has changed a lot.  This document will be updated soon with the correct details.
 
 ## Launching the Host Process
 
-From your editor's PowerShell plugin code, launch `Microsoft.PowerShell.EditorServices.Host.exe` 
-using an editor-native process API that allows you to read and write this process' standard in/out 
+From your editor's PowerShell plugin code, launch `Microsoft.PowerShell.EditorServices.Host.exe`
+using an editor-native process API that allows you to read and write this process' standard in/out
 streams.  All communication with the host process occurs via this channel.
 
-It is recommended that the process I/O be dealt with as a byte stream rather than read as a 
-string since different parts of the message format could be sent with different text encodings 
+It is recommended that the process I/O be dealt with as a byte stream rather than read as a
+string since different parts of the message format could be sent with different text encodings
 (see next section).
 
 It is expected that an editor will launch one instance of the host process for each PowerShell
@@ -24,7 +24,7 @@ which contains all of the user's PowerShell script files for a given project.
 # Message Protocol
 
 A message consists of two parts: a header section and the message body.  For now, there is
-only one header, `Content-Length`.  This header, written with ASCII encoding, specifies the 
+only one header, `Content-Length`.  This header, written with ASCII encoding, specifies the
 UTF-8 byte length of the message content to follow.  The host process expects that all messages
 sent to it will come with an accurate `Content-Length` header so that it knows exactly how many
 bytes to read.  Likewise, all messages returned from the host process will be sent in this manner.
@@ -59,7 +59,7 @@ In this case, the `type` field will be set to `request`.
 A response gets sent by the host process when a request completes or fails.  In this case,
 the `type`field will be set to `response`.
 
-- `request_seq`: The `seq` number that was included with the original request, used to help 
+- `request_seq`: The `seq` number that was included with the original request, used to help
   the editor correlate the response to the original request
 - `command`: The name of the request command to which this response relates
 - `body`: A JSON object body for the response, varies per each response `command`.
@@ -68,7 +68,7 @@ the `type`field will be set to `response`.
 
 ### Event Fields
 
-An event gets sent by the host process when 
+An event gets sent by the host process when
 
 - `event`: The name of the event type to which this event relates
 - `body`: A JSON object body for the event, varies per each `event` type
@@ -128,19 +128,19 @@ No response is needed for this command.
 ### `change`
 
 This request is sent by the editor when the user changes the contents of a PowerShell file that has previously
-been opened in the language service.  Depending on how the request arguments are specified, the file change could 
-either be an arbitrary-length string insertion, region delete, or region replacement.  
+been opened in the language service.  Depending on how the request arguments are specified, the file change could
+either be an arbitrary-length string insertion, region delete, or region replacement.
 
 It is up to the editor to decide how often to send these requests in response
 to the user's typing activity.  The language service can deal with change deltas of any length, so it is really
-just a matter of preference how often `change` requests are sent.  
+just a matter of preference how often `change` requests are sent.
 
 #### Request
 
 The arguments for this request specify the absolute path of the `file` being changed as well as the complete details
 of the edit that the user performed.  The `line`/`endLine` and `offset`/`endOffset` (column) numbers indicate the
-1-based range of the file that is being replaced.  The `insertString` field indicates the string that will be 
-inserted.  In the specified range. 
+1-based range of the file that is being replaced.  The `insertString` field indicates the string that will be
+inserted.  In the specified range.
 
 *NOTE: In the very near future, all file locations will be specified with zero-based coordinates.*
 
@@ -256,9 +256,9 @@ be cancelled server-side and a new delay period will start.
           "kindModifiers": null,
           "sortText": null
         },
-        
+
         ... many more completions ...
-        
+
       ],
       "seq": 0,
       "type": "response"
@@ -486,9 +486,9 @@ be cancelled server-side and a new delay period will start.
             "offset": 19
           }
         },
-        
+
         ... more occurrences ...
-        
+
       ],
       "seq": 0,
       "type": "response"
@@ -536,13 +536,13 @@ debugger.
 
 ### `disconnect`
 
-This request is sent by the editor when the user wants to terminate the debugging session before 
+This request is sent by the editor when the user wants to terminate the debugging session before
 the script completes.  When this message is received, execution of the script is aborted and the
 instance of the host process is aborted.
 
 *NOTE: For now, it is assumed that debugging will be performed in a separate instance of the
  host process.  This will change in the next couple of minor releases.*
- 
+
 #### Request
 
 ```json
@@ -573,7 +573,7 @@ instance of the host process is aborted.
 ```
 
 ### `setBreakpoints`
- 
+
 #### Request
 
 ```json
@@ -614,7 +614,7 @@ instance of the host process is aborted.
 ```
 
 ### `pause`
- 
+
 #### Request
 
 ```json
@@ -631,7 +631,7 @@ No response needed for this command.  The debugging service will send a `stopped
 when execution is stopped due to this request.
 
 ### `continue`
- 
+
 #### Request
 
 ```json
@@ -657,7 +657,7 @@ when execution is stopped due to this request.
 ```
 
 ### `next`
- 
+
 #### Request
 
 ```json
@@ -683,7 +683,7 @@ when execution is stopped due to this request.
 ```
 
 ### `stepIn`
- 
+
 #### Request
 
 ```json
@@ -709,7 +709,7 @@ when execution is stopped due to this request.
 ```
 
 ### `stepOut`
- 
+
 #### Request
 
 ```json
@@ -735,7 +735,7 @@ when execution is stopped due to this request.
 ```
 
 ### `threads`
- 
+
 #### Request
 
 ```json
@@ -768,7 +768,7 @@ when execution is stopped due to this request.
 ```
 
 ### `scopes`
- 
+
 #### Request
 
 ```json
@@ -805,7 +805,7 @@ when execution is stopped due to this request.
 ```
 
 ### `variables`
- 
+
 #### Request
 
 ```json
@@ -861,7 +861,7 @@ when execution is stopped due to this request.
           },
 
           ... more variables ...
-          
+
         ]
       },
       "seq": 0,
@@ -870,7 +870,7 @@ when execution is stopped due to this request.
 ```
 
 ### `stackTrace`
- 
+
 #### Request
 
 ```json
@@ -936,7 +936,7 @@ when execution is stopped due to this request.
 ```
 
 ### `evaluate`
- 
+
 #### Request
 
 ```json
diff --git a/docs/images/PowerShell_logo.png b/docs/images/PowerShell_logo.png
new file mode 100644
index 000000000..2a656ffc3
Binary files /dev/null and b/docs/images/PowerShell_logo.png differ
diff --git a/docs/images/vsc_command_palette.png b/docs/images/vsc_command_palette.png
new file mode 100644
index 000000000..50115449d
Binary files /dev/null and b/docs/images/vsc_command_palette.png differ
diff --git a/docs/images/vsc_editor_command_list.png b/docs/images/vsc_editor_command_list.png
new file mode 100644
index 000000000..2e58f1441
Binary files /dev/null and b/docs/images/vsc_editor_command_list.png differ
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 000000000..357630f7b
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,27 @@
+# PowerShell Editor Services
+
+PowerShell Editor Services provides common functionality that is needed
+to enable a consistent and robust PowerShell development experience
+across multiple editors.
+
+## [User Guide](guide/introduction.md)
+
+The User Guide describes the high level design of this project and gives
+guidance on how to use it.
+
+## [API Reference](api/index.md)
+
+The API Reference contains details about the .NET API.
+
+## Getting Help
+
+If you run into any issues while using PowerShell Editor Services and this documentation doesn't
+answer your question, feel free to file an issue on our
+[GitHub page](https://github.com/PowerShell/PowerShellEditorServices/issues) or contact the
+via Twitter ([@daviwil](http://twitter.com/daviwil) and [@r_keith_hill](http://twitter.com/r_keith_hill))
+
+## Contributing
+
+We would love to incorporate community contributions into this project.  If you would like to
+contribute code, documentation, tests, or bug reports, please read our [Contribution Guide]
+(../CONTRIBUTING.md) to learn more.
diff --git a/docs/template/conceptual.html.primary.tmpl b/docs/template/conceptual.html.primary.tmpl
new file mode 100644
index 000000000..bea049317
--- /dev/null
+++ b/docs/template/conceptual.html.primary.tmpl
@@ -0,0 +1,55 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!include(/^styles/.*/)}}
+{{!include(/^fonts/.*/)}}
+{{!include(favicon.ico)}}
+{{!include(logo.svg)}}
+<!DOCTYPE html>
+<!--[if IE]><![endif]-->
+<html>
+  {{>partials/head}}
+  <body data-spy="scroll" data-target="#affix">
+    <div id="wrapper">
+      <header>
+        {{^_disableNavbar}}
+        {{>partials/navbar}}
+        {{/_disableNavbar}}
+        {{^_disableBreadcrumb}}
+        {{>partials/breadcrumb}}
+        {{/_disableBreadcrumb}}
+      </header>
+      <div role="main" class="container body-content">
+      {{^_disableToc}}
+        {{>partials/toc}}
+        <div class="article row grid-right">
+      {{/_disableToc}}
+      {{#_disableToc}}
+        <div class="article row grid">
+        {{/_disableToc}}
+          {{#_disableAffix}}
+          <div class="col-md-12">
+          {{/_disableAffix}}
+          {{^_disableAffix}}
+          <div class="col-md-10">
+          {{/_disableAffix}}
+            <article class="content wrap" id="_content">
+            {{^_disableContribution}}
+              {{#docurl}}
+              <a href="{{docurl}}" class="pull-right mobile-hide"><span class="fa fa-github"></span> Improve this Doc</a>
+              {{/docurl}}
+              {{/_disableContribution}}
+              {{{rawTitle}}}
+              {{{conceptual}}}
+            </article>
+          </div>
+          {{^_disableAffix}}
+          {{>partials/affix}}
+          {{/_disableAffix}}
+        </div>
+      </div>
+      {{^_disableFooter}}
+      {{>partials/footer}}
+      {{/_disableFooter}}
+    </div>
+    {{>partials/scripts}}
+  </body>
+</html>
diff --git a/docs/template/partials/class.tmpl.partial b/docs/template/partials/class.tmpl.partial
new file mode 100644
index 000000000..c898239f6
--- /dev/null
+++ b/docs/template/partials/class.tmpl.partial
@@ -0,0 +1,135 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+{{^_disableContribution}}
+{{#docurl}}<a href="{{docurl}}" class="pull-right mobile-hide"><span class="fa fa-github"></span>{{__global.improveThisDoc}}</a>{{/docurl}}
+{{#sourceurl}}<a href="{{sourceurl}}" class="pull-right mobile-hide">{{__global.viewSource}}</a>{{/sourceurl}}
+{{/_disableContribution}}
+<h1 id="{{id}}" data-uid="{{uid}}">{{>partials/title}}</h1>
+<div class="markdown level0 summary">{{{summary}}}</div>
+<div class="markdown level0 conceptual">{{{conceptual}}}</div>
+{{#inheritance.0}}
+<div class="inheritance">
+  <h5>{{__global.inheritance}}</h5>
+{{#inheritance}}
+    <div class="level{{index}}">{{{specName.0.value}}}</div>
+{{/inheritance}}
+    <div class="level{{item.level}}"><span class="xref">{{item.name.0.value}}</span></div>
+</div>
+{{/inheritance.0}}
+<h6><strong>{{__global.namespace}}</strong>:{{namespace}}</h6>
+<h6><strong>{{__global.assembly}}</strong>:{{assemblies.0}}.dll</h6>
+<h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
+<div class="codewrapper">
+  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
+</div>
+{{#remarks}}
+<h5 id="{{id}}_remarks"><strong>{{__global.remarks}}</strong></h5>
+<div class="markdown level0 remarks">{{{remarks}}}</div>
+{{/remarks}}
+{{#children}}
+<h3 id="{{id}}">{{>partials/classSubtitle}}</h3>
+{{#children}}
+{{^_disableContribution}}
+{{#docurl}}
+<span class="small pull-right mobile-hide">
+  <span class="divider">|</span>
+  <a href="{{docurl}}">{{__global.improveThisDoc}}</a>
+</span>{{/docurl}}
+{{#sourceurl}}
+<span class="small pull-right mobile-hide">
+  <a href="{{sourceurl}}">{{__global.viewSource}}</a>
+</span>{{/sourceurl}}
+{{/_disableContribution}}
+<h4 id="{{id}}" data-uid="{{uid}}">{{name.0.value}}</h4>
+<div class="markdown level1 summary">{{{summary}}}</div>
+<div class="markdown level1 conceptual">{{{conceptual}}}</div>
+{{#remarks}}
+<h5 id="{{id}}_remarks">{{__global.remarks}}</h5>
+<div class="markdown level1 remarks">{{{remarks}}}</div>
+{{/remarks}}
+<h5 class="decalaration">{{__global.declaration}}</h5>
+{{#syntax}}
+<div class="codewrapper">
+  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
+</div>
+{{#parameters.0}}
+<h5 class="parameters">{{__global.parameters}}</h5>
+<table class="table table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>{{__global.type}}</th>
+      <th>{{__global.name}}</th>
+      <th>{{__global.description}}</th>
+    </tr>
+  </thead>
+  <tbody>
+{{/parameters.0}}
+{{#parameters}}
+    <tr>
+      <td>{{{type.specName.0.value}}}</td>
+      <td><em>{{{id}}}</em></td>
+      <td>{{{description}}}</td>
+    </tr>
+  {{/parameters}}
+  {{#parameters.0}}
+  </tbody>
+</table>
+{{/parameters.0}}
+{{#return}}
+<h5 class="returns">{{__global.returns}}</h5>
+<table class="table table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>{{__global.type}}</th>
+      <th>{{__global.description}}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>{{{type.specName.0.value}}}</td>
+      <td>{{{description}}}</td>
+    </tr>
+  </tbody>
+</table>
+{{/return}}
+{{#propertyValue}}
+<h5 class="propertyValue">{{__global.provertyValue}}</h5>
+<table class="table table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>{{__global.type}}</th>
+      <th>{{__global.description}}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>{{{type.specName.0.value}}}</td>
+      <td>{{{description}}}</td>
+    </tr>
+  </tbody>
+</table>
+{{/propertyValue}}
+{{/syntax}}
+{{#exceptions.0}}
+<h5 class="exceptions">{{__global.exceptions}}</h5>
+<table class="table table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>{{__global.type}}</th>
+      <th>{{__global.condition}}</th>
+    </tr>
+  </thead>
+  <tbody>
+{{/exceptions.0}}
+{{#exceptions}}
+    <tr>
+      <td>{{{type.specName.0.value}}}</td>
+      <td>{{{description}}}</td>
+    </tr>
+{{/exceptions}}
+{{#exceptions.0}}
+  </tbody>
+</table>
+{{/exceptions.0}}
+{{/children}}
+{{/children}}
diff --git a/docs/template/partials/footer.tmpl.partial b/docs/template/partials/footer.tmpl.partial
new file mode 100644
index 000000000..47254342c
--- /dev/null
+++ b/docs/template/partials/footer.tmpl.partial
@@ -0,0 +1,7 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+<footer>
+  <div class="inner-footer">
+    <p>© Microsoft &nbsp;//&nbsp; Generated with <a href="https://github.com/dotnet/docfx">DocFX</a></p>
+    </div>
+</footer>
diff --git a/docs/template/partials/head.tmpl.partial b/docs/template/partials/head.tmpl.partial
new file mode 100644
index 000000000..95c6b4424
--- /dev/null
+++ b/docs/template/partials/head.tmpl.partial
@@ -0,0 +1,28 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <title>{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}</title>
+  <meta name="viewport" content="width=device-width">
+  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
+  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
+  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
+  <link rel="stylesheet" href="{{_rel}}styles/main.css">
+  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
+  <link rel="stylesheet" href="{{_rel}}styles/style.css">
+  <meta property="docfx:navrel" content="{{_navRel}}">
+  <meta property="docfx:tocrel" content="{{_tocRel}}">
+  <!--
+  <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-63735192-1', 'auto');
+  ga('send', 'pageview');
+  </script>
+  -->
+</head>
\ No newline at end of file
diff --git a/docs/template/partials/namespace.tmpl.partial b/docs/template/partials/namespace.tmpl.partial
new file mode 100644
index 000000000..1147b2278
--- /dev/null
+++ b/docs/template/partials/namespace.tmpl.partial
@@ -0,0 +1,21 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+{{^_disableContribution}}
+{{#docurl}}
+<a href="{{docurl}}" class="pull-right mobile-hide"><span class="fa fa-github"></span>{{__global.improveThisDoc}}</a>
+{{/docurl}}
+{{#sourceurl}}
+<a href="{{sourceurl}}" class="pull-right mobile-hide">{{__global.viewSource}}</a>
+{{/sourceurl}}
+{{/_disableContribution}}
+<h1 id="{{id}}" data-uid="{{uid}}">{{>partials/title}}</h1>
+<div class="markdown level0 summary">{{{summary}}}</div>
+<div class="markdown level0 conceptual">{{{conceptual}}}</div>
+<div class="markdown level0 remarks">{{{remarks}}}</div>
+{{#children}}
+  <h3 id="{{id}}">{{>partials/namespaceSubtitle}}</h3>
+  {{#children}}
+    <h4>{{{specName.0.value}}}</h4>
+    <section>{{{summary}}}</section>
+  {{/children}}
+{{/children}}
diff --git a/docs/template/partials/navbar.tmpl.partial b/docs/template/partials/navbar.tmpl.partial
new file mode 100644
index 000000000..0b1663b50
--- /dev/null
+++ b/docs/template/partials/navbar.tmpl.partial
@@ -0,0 +1,18 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+<nav class="navbar navbar-inverse">
+     <div class="container">
+       <a href="{{_rel}}"><img height="50px" src="{{_rel}}images/PowerShell_logo.png" style="float:right;"/></a>
+       <div class="navbar-header ">
+         <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+           <span class="sr-only">Toggle navigation</span>
+           <span class="icon-bar"></span>
+           <span class="icon-bar"></span>
+           <span class="icon-bar"></span>
+         </button>
+         <a class="navbar-brand" href="{{_rel}}"><span class="dotnet">PowerShell Editor Services</span></a>
+       </div>
+       <div id="navbar" class="collapse navbar-collapse">
+       </div><!--/.nav-collapse -->
+     </div>
+   </nav>
diff --git a/docs/template/styles/main.css b/docs/template/styles/main.css
new file mode 100644
index 000000000..f9c1549f5
--- /dev/null
+++ b/docs/template/styles/main.css
@@ -0,0 +1,268 @@
+@import url(//fonts.googleapis.com/css?family=Roboto+Condensed:700);
+@import url(//fonts.googleapis.com/css?family=Open+Sans);
+
+/* Main styles */
+body {
+  font-family: "Open Sans", "Segoe UI", sans-serif;
+  font-size: 15px;
+  padding-top: 50px;
+}
+ul {
+  list-style-image: url("../../images/core/list-bullet.png");
+}
+nav {
+  font-size: 14px;
+}
+.navbar-nav > li > a.nav-active, .navbar-nav > li > a.nav-active:hover {
+  background-color: #333;
+  color: #fff;
+}
+
+h1, h2, h3, h4, h5 {
+  font-family: "Roboto Condensed", "Segoe UI", sans-serif;
+  font-weight: bold;
+}
+
+
+footer {
+  text-align: center;
+  width: 100%;
+  margin-top: 50px;
+  color: #c0c0c0;
+}
+footer > .inner-footer a {
+  color: #c0c0c0;
+  text-decoration: none;
+}
+footer > .inner-footer a:hover {
+  color: #32145a;
+  text-decoration: none;
+}
+.content a {
+  /*color: #A979B3;*/
+    color: #A356B3;
+  text-decoration: none;
+  outline: 0;
+}
+.content a:hover {
+  /*transition: color .15s cubic-bezier(.33, .66, .66, 1);*/
+  text-decoration: none;
+  color: #682079;
+}
+
+
+/* End of main styles */
+
+/* Index page styles */
+.btn-hero-core {
+  padding: 15px 25px;
+  background-color: #32145a;
+  color: #d89ae4;
+  display: inline-block;
+  font-family: "Open Sans", sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin-left: 20px;
+  -webkit-box-shadow: 2px 2px 3px 0px #2C0D33;  /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
+  -moz-box-shadow:    2px 2px 3px 0px #2C0D33;  /* Firefox 3.5 - 3.6 */
+  box-shadow:         2px 2px 3px 0px #2C0D33;  /* Opera 10.5, IE 9, Firefox 4+, Chrome 6+, iOS 5 */
+}
+.btn-hero-core:hover {
+  color: #d89ae4;
+  text-decoration: none;
+}
+.hero {
+  background-color: #682079;
+  width: inherit;
+  color: #fff;
+}
+.starter-template {
+  padding: 40px 15px;
+  text-align: center;
+}
+.dotnet {
+  color: #fff;
+}
+#rest-vps {
+  display: none;
+}
+.value-prop-heading {
+  margin-top: 0px;
+}
+.value-props {
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
+
+.intro-image {
+  text-align: center;
+}
+.intro-image > img {
+  margin-top: 20px;
+}
+
+/* End of index page styles */
+
+/* Getting started page styles */
+.getting-started-intro {
+  text-align: center;
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
+.getting-started-intro > h2, h4 {
+  margin-bottom: 30px;
+}
+.btn-gs {
+  width: 150px;
+}
+.btn-gs:hover, .btn-gs:active, .btn-gs:focus, .jquery-active {
+  color: #fff;
+  background-color: #682079;
+  outline: 0 !important;
+}
+
+
+.step {
+  width: 100%;
+  margin: 50px auto;
+  padding: 20px 0px;
+  text-align: center;
+  font-size: 16px;
+  border: solid 1px #c0c0c0;
+  min-height: 300px;
+  background-color: #fff;
+  border-radius: 10px;
+}
+.step-block {
+  display: block;
+}
+.step-none {
+  display: none;
+}
+.step-number {
+  position: relative;
+  top: -40px;
+  background-color: #32145a;
+  color: #fff;
+  font-weight: bold;
+  font-size: 24px;
+  z-index: 999;
+  margin-left: auto;
+  margin-right: auto;
+  width: 80px;
+  padding: 10px;
+  border: solid 1px #c0c0c0;
+  border-radius: 10px;
+}
+
+.step > h3 {
+  margin: 0;
+  margin-bottom: 30px;
+  font-size: 30px;
+}
+.step > p {
+  margin-top: 10px;
+  margin-bottom: 20px;
+  width: 70%;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+}
+.code-sample {
+  white-space: pre;
+}
+
+
+/* Terminal backgrounds */
+.terminal {
+  display: block;
+  width: 850px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.terminal-titlebar {
+  background-color: #c0c0c0;
+  height: 30px;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+
+.terminal-body {
+  background-color: #000;
+  color: #fff;
+  font-family: "Consolas", "Monaco", monospace;
+  font-size: 16px;
+  font-weight: bold;
+  padding: 15px;
+  text-align: left;
+  height: auto;
+  overflow: auto;
+  word-wrap: break-word;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+.prompt {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  color: #c0c0c0;
+}
+.windows-prompt:after {
+    content: 'PS > ';
+}
+.unix-prompt:after {
+  content: '~$ ';
+}
+
+@media (max-device-width: 480px) and (orientation: portrait), (max-device-width: 700px) and (orientation: landscape){
+  /* Index page overrides */
+  .btn-hero-core {
+    padding: 10px 15px;
+    margin-left: 0px;
+    font-size: 16px;
+  }
+  .intro-image > img {
+    display: none;
+  }
+
+  /* Overview overrides */
+  img[src*="10kft_view"] {
+    width: 100%;
+    height: 100%;
+  }
+
+  /* Getting started overrides */
+  .btn-gs {
+    width: auto;
+  }
+
+  .btn-gs:hover, .btn-gs:active, .btn-gs:focus, .jquery-active {
+    width: auto;
+  }
+
+  .step {
+    width: 90%;
+    font-size: 14px;
+  }
+  .step > h3 {
+    font-size: 24px;
+  }
+  .step-number {
+    width: 40px;
+    font-size: 18px;
+    padding: 5px;
+  }
+  .terminal {
+    width: 95%;
+  }
+  .terminal-titlebar {
+    height: 20px;
+  }
+  .terminal-body {
+    font-size: 12px;
+    padding: 5px;
+  }
+}
diff --git a/docs/template/styles/style.css b/docs/template/styles/style.css
new file mode 100644
index 000000000..2fd826e1d
--- /dev/null
+++ b/docs/template/styles/style.css
@@ -0,0 +1,43 @@
+body {
+  font-family: "Open Sans", "Segoe UI", sans-serif;
+  padding-top: 0px;
+}
+footer {
+  z-index: 0;
+}
+.navbar-brand {
+  font-size: 18px;
+  padding: 15px;
+}
+.toc .level3 {
+  font-weight: normal;
+  margin-top: 5px;
+  margin-left: 10px;
+}
+a.pull-right {
+    margin-left: 10px;
+    padding-top: 5px;
+}
+article.content > h1 {
+    word-break: break-word;
+}
+@media only screen and (max-width: 768px) {
+  .toc .level3 > li {
+    display: inline-block;
+  }
+  .toc .level3 > li:after {
+    margin-left: -3px;
+    margin-right: 5px;
+    content: ", ";
+    color: #666666;
+  }
+}
+@media (max-width: 260px)  {
+  .toc .level3 > li {
+    display: block;
+  }
+
+  .toc .level3 > li:after {
+    display: none;
+  }
+}
diff --git a/docs/toc.yml b/docs/toc.yml
new file mode 100644
index 000000000..01f0d406e
--- /dev/null
+++ b/docs/toc.yml
@@ -0,0 +1,5 @@
+- name: User Guide
+  href: guide/
+  homepage: guide/introduction.md
+- name: API Reference
+  href: api/
diff --git a/docs/using_the_dotnet_api.md b/docs/using_the_dotnet_api.md
deleted file mode 100644
index 4d3da4669..000000000
--- a/docs/using_the_dotnet_api.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Using the PowerShell Editor Services .NET API
-
-**TODO:** Provide conceptual overview and code examples.
\ No newline at end of file
diff --git a/scripts/BuildDocs.ps1 b/scripts/BuildDocs.ps1
new file mode 100644
index 000000000..891861d07
--- /dev/null
+++ b/scripts/BuildDocs.ps1
@@ -0,0 +1,73 @@
+param([switch]$Serve, [switch]$Clean, [switch]$Publish)
+
+$toolsPath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\tools")
+$docfxZipPath = [System.IO.Path]::GetFullPath("$toolsPath\docfx.zip")
+$docfxBinPath = [System.IO.Path]::GetFullPath("$toolsPath\docfx\")
+$docfxExePath = [System.IO.Path]::GetFullPath("$docfxBinPath\docfx.exe")
+$docfxJsonPath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\docs\docfx.json")
+$sitePath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\docs\_site")
+$docsRepoPath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\docs\_repo")
+
+# Ensure the tools path exists
+mkdir $toolsPath -Force | Out-Null
+
+if (![System.IO.File]::Exists($docfxExePath)) {
+    # Download DocFX
+    Remove-Item -Path "$docfxBinPath" -Force -ErrorAction Stop | Out-Null
+    (new-object net.webclient).DownloadFile('https://github.com/dotnet/docfx/releases/download/v1.8/docfx.zip', "$docfxZipPath")
+
+    # Extract the archive
+    Expand-Archive $docfxZipPath -DestinationPath $docfxBinPath -Force -ErrorAction "Stop"
+}
+
+# Clean the _site folder if necessary
+if ($Clean.IsPresent) {
+    Remove-Item -Path $sitePath -Force -Recurse | Out-Null
+}
+
+# Build the metadata for the C# API
+& $docfxExePath metadata $docfxJsonPath
+
+if ($Serve.IsPresent) {
+    & $docfxExePath build $docfxJsonPath --serve
+}
+else {
+    & $docfxExePath build $docfxJsonPath
+
+    if ($Publish.IsPresent) {
+        # Delete the existing docs repo folder
+        Remove-Item -Path $docsRepoPath -Recurse -Force -ErrorAction Stop | Out-Null
+
+        # Clone the documentation site branch of the Editor Services repo
+        git clone -b gh-pages https://github.com/PowerShell/PowerShellEditorServices.git $docsRepoPath
+
+        # Copy the site files into the repo path
+        Write-Host -ForegroundColor Green "*** Copying documentation site files ***"
+        Copy-Item -Recurse -Force $sitePath\* $docsRepoPath
+
+        # Enter the repo path and commit the changes
+        Write-Host -ForegroundColor Green "*** Committing changes ***"
+        Push-Location $docsRepoPath
+        git add -A
+        git commit -m "Updated documentation site"
+
+        # Verify that we're ready to push and then do it
+        $response =
+            $host.ui.PromptForChoice(
+                "Ready to push?",
+                "Are you ready to push the doc site changes?",
+                [System.Management.Automation.Host.ChoiceDescription[]](
+                    (New-Object System.Management.Automation.Host.ChoiceDescription "&Yes","Yes"),
+                    (New-Object System.Management.Automation.Host.ChoiceDescription "&No","No")
+                ),
+                1);
+
+        if ($response -eq 0) {
+            Write-Host -ForegroundColor Green "*** Pushing changes ***"
+            git push origin gh-pages
+        }
+        else {
+            Write-Output "Did not push changes. Run 'git push origin gh-pages' manually when ready."
+        }
+    }
+}