Regen docsite

2025-05-23 10:44:10 +00:00 · 2016-11-29 18:44:59 +00:00 · 2016-11-29 18:44:59 +00:00 · b4c0229ccc
commit b4c0229ccc
parent c9b4755f55
109 changed files with 7289 additions and 900 deletions
--- a/docs/build/doctrees/CLI-vs-IDE.doctree
+++ b/docs/build/doctrees/CLI-vs-IDE.doctree
--- a/docs/build/doctrees/clauses.doctree
+++ b/docs/build/doctrees/clauses.doctree
--- a/docs/build/doctrees/contract-catalogue.doctree
+++ b/docs/build/doctrees/contract-catalogue.doctree
--- a/docs/build/doctrees/corda-configuration-file.doctree
+++ b/docs/build/doctrees/corda-configuration-file.doctree
--- a/docs/build/doctrees/corda-plugins.doctree
+++ b/docs/build/doctrees/corda-plugins.doctree
--- a/docs/build/doctrees/creating-a-cordapp.doctree
+++ b/docs/build/doctrees/creating-a-cordapp.doctree
--- a/docs/build/doctrees/environment.pickle
+++ b/docs/build/doctrees/environment.pickle
--- a/docs/build/doctrees/getting-set-up-fault-finding.doctree
+++ b/docs/build/doctrees/getting-set-up-fault-finding.doctree
--- a/docs/build/doctrees/getting-set-up.doctree
+++ b/docs/build/doctrees/getting-set-up.doctree
--- a/docs/build/doctrees/index.doctree
+++ b/docs/build/doctrees/index.doctree
--- a/docs/build/doctrees/oracles.doctree
+++ b/docs/build/doctrees/oracles.doctree
--- a/docs/build/doctrees/persistence.doctree
+++ b/docs/build/doctrees/persistence.doctree
--- a/docs/build/doctrees/release-notes.doctree
+++ b/docs/build/doctrees/release-notes.doctree
--- a/docs/build/doctrees/running-the-demos.doctree
+++ b/docs/build/doctrees/running-the-demos.doctree
--- a/docs/build/doctrees/setting-up-a-corda-network.doctree
+++ b/docs/build/doctrees/setting-up-a-corda-network.doctree
--- a/docs/build/doctrees/transaction-data-types.doctree
+++ b/docs/build/doctrees/transaction-data-types.doctree
--- a/docs/build/doctrees/tutorial-building-transactions.doctree
+++ b/docs/build/doctrees/tutorial-building-transactions.doctree
--- a/docs/build/doctrees/tutorial-clientrpc-api.doctree
+++ b/docs/build/doctrees/tutorial-clientrpc-api.doctree
--- a/docs/build/doctrees/tutorial-contract-clauses.doctree
+++ b/docs/build/doctrees/tutorial-contract-clauses.doctree
--- a/docs/build/doctrees/tutorial-contract.doctree
+++ b/docs/build/doctrees/tutorial-contract.doctree
--- a/docs/build/doctrees/tutorial-cordapp.doctree
+++ b/docs/build/doctrees/tutorial-cordapp.doctree
--- a/docs/build/doctrees/tutorial-integration-testing.doctree
+++ b/docs/build/doctrees/tutorial-integration-testing.doctree
--- a/docs/build/html/.buildinfo
+++ b/docs/build/html/.buildinfo
@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: ad4aa434cfebd269fdbb85815bc6eb43
+config: caa85c0cfb7660f75ff8985c07fa3b0c
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/build/html/CLI-vs-IDE.html
+++ b/docs/build/html/CLI-vs-IDE.html
@ -0,0 +1,352 @@
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>CLI vs IDE &mdash; R3 Corda latest documentation</title>
    <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Data model" href="data-model.html"/>
        <link rel="prev" title="Running the demos" href="running-the-demos.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
 </head>
 <body class="wy-body-for-nav" role="document">
  <div class="wy-grid-for-nav">
    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
      <div class="wy-side-scroll">
        <div class="wy-side-nav-search">
            <a href="index.html" class="icon icon-home"> R3 Corda
          </a>
              <div class="version">
                latest
              </div>
 <div role="search">
  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
    <input type="text" name="q" placeholder="Search docs" />
    <input type="hidden" name="check_keywords" value="yes" />
    <input type="hidden" name="area" value="default" />
  </form>
 </div>
 <br>
 <a href="api/index.html">API reference</a>
        </div>
        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
                <p class="caption"><span class="caption-text">Getting started</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">CLI vs IDE</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#ide-intellij">IDE - IntelliJ</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#command-line">Command Line</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#windows-vs-mac-unix">Windows vs Mac / Unix</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#frequently-used-gradle-tasks">Frequently Used Gradle Tasks</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#debugging">Debugging</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#via-the-ide">Via the IDE</a></li>
 </ul>
 </li>
 </ul>
 </li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="clientrpc.html">Client RPC</a></li>
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
 <li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-notes.html">Release notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="codestyle.html">Code style guide</a></li>
 <li class="toctree-l1"><a class="reference internal" href="building-the-docs.html">Building the documentation</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Glossary</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="glossary.html">Glossary</a></li>
 </ul>
        </div>
      </div>
    </nav>
    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
        <a href="index.html">R3 Corda</a>
      </nav>
      <div class="wy-nav-content">
        <div class="rst-content">
 <div role="navigation" aria-label="breadcrumbs navigation">
  <ul class="wy-breadcrumbs">
    <li><a href="index.html">Docs</a> &raquo;</li>
    <li>CLI vs IDE</li>
      <li class="wy-breadcrumbs-aside">
            <a href="_sources/CLI-vs-IDE.txt" rel="nofollow"> View page source</a>
      </li>
  </ul>
  <hr/>
 </div>
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
           <div itemprop="articleBody">
  <div class="section" id="cli-vs-ide">
 <h1>CLI vs IDE<a class="headerlink" href="#cli-vs-ide" title="Permalink to this headline">¶</a></h1>
 <p>We have tried to make every demo, example, tutorial and sample to be both usuable via the command line and also the IntelliJ IDE.
 Most developers will find writing, editing and debugging code more easily done via tools such as an IDE, but when code needs
 to be deployed to run as nodes, control must be done via the command line - no organisations allow their systems to be running via
 a developer environment.</p>
 <div class="section" id="ide-intellij">
 <h2>IDE - IntelliJ<a class="headerlink" href="#ide-intellij" title="Permalink to this headline">¶</a></h2>
 <p>IntelliJ (the preferred IDE in R3) integrates well with gradle (our chosed build, deploy and CLI tool). IntelliJ understands gradle
 tasks and dependencies, automatically loading them in the background when a project is first loaded or the gradle
 project changes. Occasionally, however, you may need to refresh the gradle project manually - but this is hinted to you
 by the IDE. It&#8217;s a good idea to do this before carrying on with other work (and in fact you may find it is essential to pick
 up new libraries etc).</p>
 <p>There are some great resources about how to get started using IntelliJ. As opposed to trying to repeat them here, we advise
 you to go to the <a class="reference external" href="https://www.jetbrains.com/idea/documentation/">IntelliJ docs here</a>.</p>
 </div>
 <div class="section" id="command-line">
 <h2>Command Line<a class="headerlink" href="#command-line" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="windows-vs-mac-unix">
 <h3>Windows vs Mac / Unix<a class="headerlink" href="#windows-vs-mac-unix" title="Permalink to this headline">¶</a></h3>
 <p>Due to the nature of their respective command interfaces, gradle is typically ran in windows with the command <code class="docutils literal"><span class="pre">gradle.bat</span></code>
 (or <code class="docutils literal"><span class="pre">gradlew.bat</span></code> if using the wrapper) and in Mac / Unix environments it is ran via <code class="docutils literal"><span class="pre">./gradlew</span></code>. For brevity, the
 simple windows syntax <code class="docutils literal"><span class="pre">gradle</span></code> is used for the majority of the documentation.</p>
 <p>As well as including the most significant run and build configurations in the IDE, we also provide gradle tasks to build, install
 and run significant parts of Corda demos and tools. Gradle is highly extensible and we use it for downloading required resources,
 building components, installing those built components into shared areas, configuring the scripts that run nodes, starting
 up demonstration API calls amongst other things. It is exceptionally good at deriving dependency maps and therefore performing
 the preceeding tasks required in order to do the requested task. However, when confusing build errors manifest, then sometimes
 a <code class="docutils literal"><span class="pre">gradle</span> <span class="pre">clean</span></code> may be required in order to clear out any build areas that have an inconsistent state. The total build time
 from downloading / cloaning the repo to a complete build should be only a few minutes, obviously slightly longer if the
 unit tests are run.</p>
 </div>
 <div class="section" id="frequently-used-gradle-tasks">
 <h3>Frequently Used Gradle Tasks<a class="headerlink" href="#frequently-used-gradle-tasks" title="Permalink to this headline">¶</a></h3>
 <p>Note that the list of tasks can be ran for any gradle project can be displayed by running the task <code class="docutils literal"><span class="pre">tasks</span></code>. Also note that
 gradle is hierachical and therefore tasks in child directories can be run using a colon seperator - ie if you want to run
 the sample attachment-demo <code class="docutils literal"><span class="pre">runSender</span></code> you would use the command <code class="docutils literal"><span class="pre">gradle</span> <span class="pre">samples:attachment-demo:runSender</span></code></p>
 <p>The most frequent gradle tasks you will probably be running are <code class="docutils literal"><span class="pre">build</span></code> and <code class="docutils literal"><span class="pre">install</span></code>. The <code class="docutils literal"><span class="pre">build</span></code> command also executes the
 unit tests as well. If you want to build without this level of verification, then use the <code class="docutils literal"><span class="pre">assemble</span></code> command - but we do
 not recommend this. After running build, the <code class="docutils literal"><span class="pre">install</span></code> tasks copies over the built jars into the local maven repository
 which will then makes these available for either the sample code or use with the CorDapp template.</p>
 </div>
 </div>
 <div class="section" id="debugging">
 <h2>Debugging<a class="headerlink" href="#debugging" title="Permalink to this headline">¶</a></h2>
 <p>Tasks and processes that are run directly via the IDE (including via the usage of the <code class="docutils literal"><span class="pre">driver</span></code> DSL) can be remotely debugged.
 We do not have java debugging currently enabled in the <code class="docutils literal"><span class="pre">runnodes</span></code> scripts generated by a process we refer to as &#8216;cordformation&#8217;
 but we will be implementing that shortly.</p>
 <div class="section" id="via-the-ide">
 <h3>Via the IDE<a class="headerlink" href="#via-the-ide" title="Permalink to this headline">¶</a></h3>
 <p>To debug: From the IDE, configure the debug connectivity option by the &#8220;Edit Configurations&#8221; and choosing &#8220;+&#8221; and then &#8220;Remote&#8221;.
 The debug port start at 5005 and increments for each additional node that starts, the order given by the list in the main
 driver configuration (which is primarily listed in the <code class="docutils literal"><span class="pre">main</span></code> function of <code class="docutils literal"><span class="pre">Main.kt</span></code> for each sample. Look for the string
 <code class="docutils literal"><span class="pre">Listening</span> <span class="pre">for</span> <span class="pre">transport</span> <span class="pre">dt_socket</span> <span class="pre">at</span> <span class="pre">address:5xxx</span></code> in the log output to determine the exact port for that node. If the log
 messages are mixed from several nodes to the same console, then (as earlier stated), the port numbers increment in the order
 they are listed in the driver DSL configuration.</p>
 </div>
 </div>
 </div>
           </div>
          </div>
          <footer>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
        <a href="data-model.html" class="btn btn-neutral float-right" title="Data model" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="running-the-demos.html" class="btn btn-neutral" title="Running the demos" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
  <hr/>
  <div role="contentinfo">
    <p>
        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
 </footer>
        </div>
      </div>
    </section>
  </div>
    <script type="text/javascript">
        var DOCUMENTATION_OPTIONS = {
            URL_ROOT:'./',
            VERSION:'latest',
            COLLAPSE_INDEX:false,
            FILE_SUFFIX:'.html',
            HAS_SOURCE:  true
        };
    </script>
      <script type="text/javascript" src="_static/jquery.js"></script>
      <script type="text/javascript" src="_static/underscore.js"></script>
      <script type="text/javascript" src="_static/doctools.js"></script>
    <script type="text/javascript" src="_static/js/theme.js"></script>
  <script type="text/javascript">
      jQuery(function () {
          SphinxRtdTheme.StickyNav.enable();
      });
  </script>
 </body>
 </html>
--- a/docs/build/html/_images/allCompositionChart.png
+++ b/docs/build/html/_images/allCompositionChart.png
--- a/docs/build/html/_images/anyCompositionChart.png
+++ b/docs/build/html/_images/anyCompositionChart.png
--- a/docs/build/html/_images/commPaperClauses.png
+++ b/docs/build/html/_images/commPaperClauses.png
--- a/docs/build/html/_images/commPaperExecution.png
+++ b/docs/build/html/_images/commPaperExecution.png
--- a/docs/build/html/_images/firstCompositionChart.png
+++ b/docs/build/html/_images/firstCompositionChart.png
--- a/docs/build/html/_images/groupClauseVerifyChart.png
+++ b/docs/build/html/_images/groupClauseVerifyChart.png
--- a/docs/build/html/_images/intellij-welcome.png
+++ b/docs/build/html/_images/intellij-welcome.png
--- a/docs/build/html/_images/run-config-drop-down.png
+++ b/docs/build/html/_images/run-config-drop-down.png
--- a/docs/build/html/_images/unlinked-gradle-project.png
+++ b/docs/build/html/_images/unlinked-gradle-project.png
--- a/docs/build/html/_sources/CLI-vs-IDE.txt
+++ b/docs/build/html/_sources/CLI-vs-IDE.txt
@ -0,0 +1,67 @@
 CLI vs IDE
 ==========
 We have tried to make every demo, example, tutorial and sample to be both usuable via the command line and also the IntelliJ IDE.
 Most developers will find writing, editing and debugging code more easily done via tools such as an IDE, but when code needs
 to be deployed to run as nodes, control must be done via the command line - no organisations allow their systems to be running via
 a developer environment.
 IDE - IntelliJ
 --------------
 IntelliJ (the preferred IDE in R3) integrates well with gradle (our chosed build, deploy and CLI tool). IntelliJ understands gradle
 tasks and dependencies, automatically loading them in the background when a project is first loaded or the gradle
 project changes. Occasionally, however, you may need to refresh the gradle project manually - but this is hinted to you
 by the IDE. It's a good idea to do this before carrying on with other work (and in fact you may find it is essential to pick
 up new libraries etc).
 There are some great resources about how to get started using IntelliJ. As opposed to trying to repeat them here, we advise
 you to go to the `IntelliJ docs here <https://www.jetbrains.com/idea/documentation/>`_.
 Command Line
 ------------
 Windows vs Mac / Unix
 *********************
 Due to the nature of their respective command interfaces, gradle is typically ran in windows with the command ``gradle.bat``
 (or ``gradlew.bat`` if using the wrapper) and in Mac / Unix environments it is ran via ``./gradlew``. For brevity, the
 simple windows syntax ``gradle`` is used for the majority of the documentation.
 As well as including the most significant run and build configurations in the IDE, we also provide gradle tasks to build, install
 and run significant parts of Corda demos and tools. Gradle is highly extensible and we use it for downloading required resources,
 building components, installing those built components into shared areas, configuring the scripts that run nodes, starting
 up demonstration API calls amongst other things. It is exceptionally good at deriving dependency maps and therefore performing
 the preceeding tasks required in order to do the requested task. However, when confusing build errors manifest, then sometimes
 a ``gradle clean`` may be required in order to clear out any build areas that have an inconsistent state. The total build time
 from downloading / cloaning the repo to a complete build should be only a few minutes, obviously slightly longer if the
 unit tests are run.
 Frequently Used Gradle Tasks
 ****************************
 Note that the list of tasks can be ran for any gradle project can be displayed by running the task ``tasks``. Also note that
 gradle is hierachical and therefore tasks in child directories can be run using a colon seperator - ie if you want to run
 the sample attachment-demo ``runSender`` you would use the command ``gradle samples:attachment-demo:runSender``
 The most frequent gradle tasks you will probably be running are ``build`` and ``install``. The ``build`` command also executes the
 unit tests as well. If you want to build without this level of verification, then use the ``assemble`` command - but we do
 not recommend this. After running build, the ``install`` tasks copies over the built jars into the local maven repository
 which will then makes these available for either the sample code or use with the CorDapp template.
 Debugging
 ---------
 Tasks and processes that are run directly via the IDE (including via the usage of the ``driver`` DSL) can be remotely debugged.
 We do not have java debugging currently enabled in the ``runnodes`` scripts generated by a process we refer to as 'cordformation'
 but we will be implementing that shortly.
 Via the IDE
 ***********
 To debug: From the IDE, configure the debug connectivity option by the "Edit Configurations" and choosing "+" and then "Remote".
 The debug port start at 5005 and increments for each additional node that starts, the order given by the list in the main
 driver configuration (which is primarily listed in the ``main`` function of ``Main.kt`` for each sample. Look for the string
 ``Listening for transport dt_socket at address:5xxx`` in the log output to determine the exact port for that node. If the log
 messages are mixed from several nodes to the same console, then (as earlier stated), the port numbers increment in the order
 they are listed in the driver DSL configuration.
--- a/docs/build/html/_sources/clauses.txt
+++ b/docs/build/html/_sources/clauses.txt
@ -0,0 +1,278 @@
 Clauses key concepts
 ====================
 Basic clause structure
 ----------------------
 A clause is a small building block for assembling contract verification logic, reusable and ready to test in separation.
 To see clauses in action go to: :doc:`tutorial-contract-clauses`.
 Let's take a look at a simplified structure of the ``Clause`` class:
 .. container:: codeset
   .. sourcecode:: kotlin
        abstract class Clause<in S : ContractState, C : CommandData, in K : Any> {
            /** Determine whether this clause runs or not */
            open val requiredCommands: Set<Class<out CommandData>> = emptySet()
            @Throws(IllegalStateException::class)
            abstract fun verify(tx: TransactionForContract,
                        inputs: List<S>,
                        outputs: List<S>,
                        commands: List<AuthenticatedObject<C>>,
                        groupingKey: K?): Set<C>
            ...
        }
 Basic clause structure contains two important components: ``requiredCommands`` and ``verify`` function.
 A clause is triggered when all ``requiredCommands`` are present in transaction's command set (opposite inclusion doesn't have to hold).
 Then the ``verify`` function is run, which checks if transaction meets conditions specified by this clause. Verification
 is no different than normal contract verification but using clauses it's split into smaller generic code blocks with single verify method.
 When writing a contract you need to override the contract's ``verify`` function which should call ``verifyClause``. See: :ref:`verify_ref`.
 .. note:: A clause ``verify`` function returns the set of processed commands, at the end of ``verifyClause`` execution
    there is a check if all of transaction's commands were matched. If not then an exception is raised. This is done to
    enforce that spurious commands cannot be included in a transaction, ensuring that the transaction is as clear as
    possible. As an example imagine a transaction with two commands: ``Move`` and ``Issue`` included, with verification written
    using ``FirstComposition`` on clauses that require single command set. Thus only one of transaction's commands will match
    leaving the second unprocessed. It should raise an error - we want to ensure that commands set is minimal to simplify
    analysis of intent of a transaction.
 An example ``verify`` from ``Obligation`` contract:
 .. container:: codeset
   .. sourcecode:: kotlin
        override fun verify(tx: TransactionForContract) = verifyClause<Commands>(tx, FirstComposition<ContractState, Commands, Unit>(
            Clauses.Net<Commands, P>(),
            Clauses.Group<P>()
        ), tx.commands.select<Obligation.Commands>())
 It takes transaction to be verified, and passes it along with a top-level clause and commands to the ``verifyClause``
 function. As you can see above we have used ``FirstComposition`` which is a special type of clause, which extends the
 ``CompositeClause`` abstract class (in that particular case, it ensures that either ``Net`` or ``Group`` will run - for explanation see `FirstComposition`_).
 It's a type of clause that adds support for encapsulating multiple clauses and defines common behaviour for that composition.
 There is also a ``GroupClauseVerifier`` special clause, which specifies how to group transaction input/output states
 together and passes them to adequate clause for further processing.
 Composition clauses
 -------------------
 One of the most important concepts of clauses - composition clauses which extend ``CompositeClause`` abstract class,
 providing a range of ways of assembling clauses together. They define a logic of verification execution specifying which clauses
 will be run.
 AllComposition
 ~~~~~~~~~~~~~~
 **Description**
 Composes a number of clauses, such that all of the clauses must run for verification to pass.
 .. image:: resources/allCompositionChart.png
 Short description:
 - ``AllComposition`` holds clauses *Cl1,..,Cl5*.
 - Check if all clauses that compose ``AllComposition`` have associated commands in a command set - if not, verification fails.
 - After successful check runs verification logic specific for every clause *Cl1,..,Cl5* from that composition.
 **Usage**
 See code in `GroupClauseVerifier`_.
 AnyComposition
 ~~~~~~~~~~~~~~
 **Description**
 Composes a number of clauses, such that 0 or more of the clauses can be run.
 .. image:: resources/anyCompositionChart.png
 Short description:
 - Checks if zero or more clauses that compose AnyComposition have associated commands in a command set.
 - After success runs verification logic specific for every *matched* (in this case *Cl2, Cl4, Cl5*) clause from composition.
 **Usage**
 Example from ``CommercialPaper.kt``:
 .. container:: codeset
    .. sourcecode:: kotlin
        class Group : GroupClauseVerifier<State, Commands, Issued<Terms>>(
            AnyComposition(
                Redeem(),
                Move(),
                Issue())) {
            override fun groupStates(tx: TransactionForContract): List<TransactionForContract.InOutGroup<State, Issued<Terms>>>
                    = tx.groupStates<State, Issued<Terms>> { it.token }
        }
 FirstComposition
 ~~~~~~~~~~~~~~~~
 **Description**
 Composes a number of clauses, such that the first match is run, and it errors if none is run.
 .. image:: resources/firstCompositionChart.png
 Short description:
 - Takes first clause that matches and if none found throws an exception.
 - If successful runs verification on the clause that matched (in this case *Cl4*).
 **Usage**
 See code in `GroupClauseVerifier`_.
 Other types of clauses
 ----------------------
 There are certain types of clauses that are specialized in particular types of contracts (like ``AbstractIssue``) or generally
 should be used as helpers in building parts of logic (the most important one is ``GroupClauseVerifier``).
 GroupClauseVerifier
 ~~~~~~~~~~~~~~~~~~~
 **Description**
 Groups input and output states according to ``groupStates`` function. Runs the top-level clause verification on each
 group in turn.
 .. image:: resources/groupClauseVerifyChart.png
 Short description:
 ``GroupClauseVerifier`` wraps clause *Cl1*. After grouping relevant states together with ``groupStates`` into three groups
 *Gr1, Gr2, Gr3* runs *Cl1.verify(Gr1), Cl1.verify(Gr2), Cl1.verify(Gr3)*.
 For more detailed example head to :ref:`state_ref`.
 **Usage**
 You need to extend ``GroupClauseVerifier`` clause and define ``groupStates`` function which takes transaction and returns
 grouped input and output states with a grouping key used for each group. Example from ``Obligation.kt`` contract:
 .. container:: codeset
   .. sourcecode:: kotlin
        class Group<P> : GroupClauseVerifier<State<P>, Commands, Issued<Terms<P>>>(
            AllComposition(
                NoZeroSizedOutputs<State<P>, Commands, Terms<P>>(),
                FirstComposition(
                    SetLifecycle<P>(),
                    AllComposition(
                        VerifyLifecycle<State<P>, Commands, Issued<Terms<P>>, P>(),
                        FirstComposition(
                            Settle<P>(),
                            Issue(),
                            ConserveAmount()
                        )
                    )
                )
            )
        ) {
            override fun groupStates(tx: TransactionForContract): List<TransactionForContract.InOutGroup<Obligation.State<P>, Issued<Terms<P>>>>
                    = tx.groupStates<Obligation.State<P>, Issued<Terms<P>>> { it.amount.token }
        }
 Usually it's convenient to use ``groupStates`` function defined on ``TransactionForContract`` class. Which given a type and a
 selector function, that returns a grouping key, associates inputs and outputs together so that they can be processed as one.
 The grouping key is any arbitrary object that can act as a map key (so must implement equals and hashCode).
 AbstractConserveAmount
 ~~~~~~~~~~~~~~~~~~~~~~
 **Description**
 Standardised clause for checking input/output balances of fungible assets. Requires that a
 Move command is provided, and errors if absent. Conserve amount clause can only be used on grouped states.
 **Usage**
 .. container:: codeset
    .. sourcecode:: kotlin
            /**
             * Generic move/exit clause for fungible assets
             */
            class ConserveAmount<P> : AbstractConserveAmount<State<P>, Commands, Terms<P>>()
 See code in `GroupClauseVerifier`_.
 AbstractIssue
 ~~~~~~~~~~~~~
 **Description**
 Standard issue clause for contracts that issue fungible assets.
 **Usage**
 Example from ``CommercialPaper.kt``:
 .. container:: codeset
    .. sourcecode:: kotlin
        class Issue : AbstractIssue<State, Commands, Terms>(
                { map { Amount(it.faceValue.quantity, it.token) }.sumOrThrow() },
                { token -> map { Amount(it.faceValue.quantity, it.token) }.sumOrZero(token) }) {
            override val requiredCommands: Set<Class<out CommandData>> = setOf(Commands.Issue::class.java)
            override fun verify(tx: TransactionForContract,
                                inputs: List<State>,
                                outputs: List<State>,
                                commands: List<AuthenticatedObject<Commands>>,
                                groupingKey: Issued<Terms>?): Set<Commands> {
                val consumedCommands = super.verify(tx, inputs, outputs, commands, groupingKey)
                ...
 First function in constructor converts a list of states into an amount of the token. Must error if there are no states in the list.
 Second function converts a list of states into an amount of the token, and returns zero if there are no states in the list.
 Takes in an instance of the token definition for constructing the zero amount if needed.
 NoZeroSizedOutputs
 ~~~~~~~~~~~~~~~~~~
 **Description**
 Clause for fungible asset contracts, which enforces that no output state should have a balance of zero.
 **Usage**
 See code in `GroupClauseVerifier`_.
 FilterOn
 ~~~~~~~~
 **Description**
 Filter the states that are passed through to the wrapped clause, to restrict them to a specific type.
 ``FilterOn`` narrows the scope of the states being verified.
 Let's take a transaction with multiple cash states of different currencies, we want to run a clause that focuses
 on only GBP cash states rather than all cash states.
 **Usage**
 .. container:: codeset
    .. sourcecode:: kotlin
                FilterOn(clause, { states -> states.filter { it.amount.token == GBP} })
 Takes ``filterStates`` function that limits states passed to ``clause`` verification.
--- a/docs/build/html/_sources/corda-configuration-file.txt
+++ b/docs/build/html/_sources/corda-configuration-file.txt
@ -78,7 +78,7 @@ Fields
    .. note:: If HTTPS is enabled then the browser security checks will require that the accessing url host name is one of either the machine name, fully qualified machine name, or server IP address to line up with the Subject Alternative Names contained within the development certificates. This is addition to requiring the ``/config/dev/corda_dev_ca.cer`` root certificate be installed as a Trusted CA.
-:extraAdvertisedServiceIds: A list of ServiceType id strings to be advertised to the NetworkMapService and thus be available when other nodes query the NetworkMapCache for supporting nodes. This can also include plugin services loaded from .jar files in the plugins folder.
+:extraAdvertisedServiceIds: A list of ServiceType id strings to be advertised to the NetworkMapService and thus be available when other nodes query the NetworkMapCache for supporting nodes. This can also include plugin services loaded from .jar files in the plugins folder. Optionally, a custom advertised service name can be provided by appending it to the service type id: ``"corda.notary.validating|Notary A"``
 :notaryNodeAddress: The host and port to which to bind the embedded Raft server. Required only when running a distributed notary service. A group of Corda nodes can run a distributed notary service by each running an embedded Raft server and joining them to the same cluster to replicate the committed state log. Note that the Raft cluster uses a separate transport layer for communication that does not integrate with ArtemisMQ messaging services.
--- a/docs/build/html/_sources/corda-plugins.txt
+++ b/docs/build/html/_sources/corda-plugins.txt
@ -65,8 +65,14 @@ extensions to be created, or registered at startup. In particular:
    d. The ``servicePlugins`` property returns a list of classes which will 
    be instantiated once during the ``AbstractNode.start`` call. These 
    classes must provide a single argument constructor which will receive a 
-    ``PluginServiceHub`` reference. These singleton instances are regarded 
+    ``PluginServiceHub`` reference. They must also extend the abstract class
-    as trusted components and can be used for a number of purposes.
+    ``SingletonSerializeAsToken`` which ensures that if any reference to your
    service is captured in a flow checkpoint (i.e. serialized by Kryo as
    part of Quasar checkpoints, either on the stack or by reference within
    your flows) it is stored as a simple token representing your service.
    When checkpoints are restored, after a node restart for example,
    the latest instance of the service will be substituted back in place of
    the token stored in the checkpoint.
        i. Firstly, they can call ``PluginServiceHub.registerFlowInitiator`` and 
        register flows that will be initiated locally in response to remote flow 
@ -79,7 +85,7 @@ extensions to be created, or registered at startup. In particular:
        to the service plugin when initiated (as defined by the 
        ``registerFlowInitiator`` call). The flow can then call into functions 
        on the plugin service singleton. Note, care should be taken to not allow 
-        flows to hold references to plugin services, or fields which are not 
+        flows to hold references to fields which are not
        also ``SingletonSerializeAsToken``, otherwise Quasar suspension in the 
        ``StateMachineManager`` will fail with exceptions. An example oracle can 
        be seen in ``NodeInterestRates.kt`` in the irs-demo sample. 
--- a/docs/build/html/_sources/creating-a-cordapp.txt
+++ b/docs/build/html/_sources/creating-a-cordapp.txt
@ -1,5 +1,5 @@
-Creating a CorDapp
+CorDapps Background
-==================
+===================
 A Cordapp is an application that runs on the Corda platform using the platform APIs and plugin system. They are self
 contained in separate JARs from the node server JAR that are created and distributed.
@ -21,7 +21,7 @@ specific details of the implementation, but you can extend the server in the fol
 Services
 --------
-Services are classes which are constructed after the node has started. It is provided a `ServiceHubInternal`_ which
+Services are classes which are constructed after the node has started. It is provided a `PluginServiceHub`_ which
 allows a richer API than the `ServiceHub`_ exposed to contracts. It enables adding flows, registering
 message handlers and more. The service does not run in a separate thread, so the only entry point to the service is during
 construction, where message handlers should be registered and threads started.
@ -93,8 +93,8 @@ The name and column layout of the internal node tables is in a state of flux and
 at the present time, and should certainly be treated as read-only.
 .. _CordaPluginRegistry: api/net.corda.core.node/-corda-plugin-registry/index.html
-.. _ServiceHubInternal: api/net.corda.node.services.api/-service-hub-internal/index.html
+.. _PluginServiceHub: api/net.corda.core.node/-plugin-service-hub/index.html
-.. _ServiceHub: api/net.corda.node.services.api/-service-hub/index.html
+.. _ServiceHub: api/net.corda.core.node/-service-hub/index.html
 Building against Corda
 ----------------------
--- a/docs/build/html/_sources/getting-set-up-fault-finding.txt
+++ b/docs/build/html/_sources/getting-set-up-fault-finding.txt
@ -4,6 +4,17 @@ Getting Set Up : Faultfinding
 IntelliJ issues
 ---------------
 Run configurations are missing
 ******************************
 If you opened the Corda project using "Import" from the IntelliJ splash screen rather than using "Open" and then
 importing the Gradle build system from the popup bubble, then a bug in IntelliJ will cause it to wipe and recreate
 the ``.idea`` directory where the run configurations are stored. The fix is simple and doesn't require you to
 re-import the project: just undelete the files! You can do that by either:
 1. Running ``git checkout .idea/runConfigurations`` to restore that part of the tree to its normal state.
 2. Using the "Version Control" pane in IntelliJ to undelete the files via the GUI.
 If IntelliJ complains about lack of an SDK
 ******************************************
--- a/docs/build/html/_sources/getting-set-up.txt
+++ b/docs/build/html/_sources/getting-set-up.txt
@ -20,6 +20,12 @@ We strongly recommend the use of IntelliJ's Development Environment known as IDE
 `JetBrains <https://www.jetbrains.com/idea/download/>`_. The primary reason we recommend this particular IDE is that it integrates
 very well with our choice of language for Corda, "Kotlin", as Jetbrains also support the development of Kotlin.
 .. warning:: When opening the Corda project for the first time from the IntelliJ splash screen, please use "Open"
   and then agree to import the Gradle project from the popup bubble. Don't pick "Import" on the splash screen,
   because a bug in IntelliJ will cause the pre-packaged run configurations to be erased. If you see this warning
   too late, it's no problem, just use ``git checkout .idea/runConfiguration`` or the version control tab in IntelliJ
   to undelete the files.
 Kotlin
 ------
--- a/docs/build/html/_sources/index.txt
+++ b/docs/build/html/_sources/index.txt
@ -1,5 +1,5 @@
-Welcome to the Corda!
+Welcome to the Corda documentation!
-=====================
+===================================
 .. warning:: This build of the docs is from the *master branch*, not a milestone release. It may not reflect the
   current state of the code.
@ -29,7 +29,9 @@ Read on to learn:
   inthebox
   getting-set-up
   getting-set-up-fault-finding
   running-the-demos
   CLI-vs-IDE
 .. toctree::
   :maxdepth: 2
@ -39,6 +41,14 @@ Read on to learn:
   transaction-data-types
   merkle-trees
   consensus
   clauses
 .. toctree::
   :maxdepth: 2
   :caption: CorDapps
   creating-a-cordapp
   tutorial-cordapp
 .. toctree::
   :maxdepth: 2
@ -54,21 +64,16 @@ Read on to learn:
   node-explorer
   permissioning
 .. toctree::
   :maxdepth: 2
   :caption: CorDapps
   creating-a-cordapp
 .. toctree::
   :maxdepth: 2
   :caption: Tutorials
   where-to-start
   tutorial-contract
   tutorial-contract-clauses
   tutorial-test-dsl
   tutorial-integration-testing
   tutorial-clientrpc-api
   tutorial-building-transactions
   flow-state-machines
   flow-testing
   running-a-notary
@ -96,6 +101,7 @@ Read on to learn:
   :caption: Appendix
   loadtesting
   setting-up-a-corda-network
   secure-coding-guidelines
   release-process
   release-notes
--- a/docs/build/html/_sources/oracles.txt
+++ b/docs/build/html/_sources/oracles.txt
@ -75,8 +75,6 @@ Here's a quick way to decide which approach makes more sense for your data sourc
 Asserting continuously varying data
 -----------------------------------
 .. note:: A future version of the platform will include a complete tutorial on implementing this type of oracle.
 Let's look at the interest rates oracle that can be found in the ``NodeInterestRates`` file. This is an example of
 an oracle that uses a command because the current interest rate fix is a constantly changing fact.
@ -93,15 +91,15 @@ So the way we actually implement it is like this:
 1. The creator of the transaction that depends on the interest rate asks for the current rate. They can abort at this point
   if they want to.
 2. They insert a command with that rate and the time it was obtained into the transaction.
-3. They then send it to the oracle for signing, along with everyone else in parallel. The oracle checks that the command
+3. They then send it to the oracle for signing, along with everyone else, potentially in parallel. The oracle checks that
-   has correct data for the asserted time, and signs if so.
+   the command has the correct data for the asserted time, and signs if so.
 This same technique can be adapted to other types of oracle.
 The oracle consists of a core class that implements the query/sign operations (for easy unit testing), and then a separate
 class that binds it to the network layer.
-Here is an extract from the ``NodeService.Oracle`` class and supporting types:
+Here is an extract from the ``NodeInterestRates.Oracle`` class and supporting types:
 .. sourcecode:: kotlin
@ -112,13 +110,31 @@ Here is an extract from the ``NodeService.Oracle`` class and supporting types:
   data class Fix(val of: FixOf, val value: BigDecimal) : CommandData
   class Oracle {
-       fun query(queries: List<FixOf>): List<Fix>
+       fun query(queries: List<FixOf>, deadline: Instant): List<Fix>
-       fun sign(wtx: WireTransaction): DigitalSignature.LegallyIdentifiable
+       fun sign(ftx: FilteredTransaction, merkleRoot: SecureHash): DigitalSignature.LegallyIdentifiable
   }
-Because the fix contains a timestamp (the ``forDay`` field), there can be an arbitrary delay between a fix being
+Because the fix contains a timestamp (the ``forDay`` field), that identifies the version of the data being requested,
-requested via ``query`` and the signature being requested via ``sign``.
+there can be an arbitrary delay between a fix being requested via ``query`` and the signature being requested via ``sign``
 as the Oracle can know which, potentially historical, value it is being asked to sign for.  This is an important
 technique for continously varying data.
 The ``query`` method takes a deadline, which is a point in time the requester is willing to wait until for the necessary
 data to be available.  Not every oracle will need this.  This can be useful where data is expected to be available on a
 particular schedule and we use scheduling functionality to automatically launch the processing associated with it.
 We can schedule for the expected announcement (or publish) time and give a suitable deadline at which the lack of the
 information being available and the delay to processing becomes significant and may need to be escalated.
 Hiding transaction data from the oracle
 ---------------------------------------
 Because the transaction is sent to the oracle for signing, ordinarily the oracle would be able to see the entire contents
 of that transaction including the inputs, output contract states and all the commands, not just the one (in this case)
 relevant command.  This is an obvious privacy leak for the other participants.  We currently solve this with
 ``FilteredTransaction``-s and the use of Merkle Trees.  These reveal only the necessary parts of the transaction to the
 oracle but still allow it to sign it by providing the Merkle hashes for the remaining parts.  See :doc:`merkle-trees` for
 more details.
 Pay-per-play oracles
 --------------------
@ -132,3 +148,124 @@ contract could in theory include a transaction parsing and signature checking li
 would be conclusive evidence of intent to disobey the rules of the service (*res ipsa loquitur*). In an environment
 where parties are legally identifiable, usage of such a contract would by itself be sufficient to trigger some sort of
 punishment.
 Implementing an oracle with continuously varying data
 =====================================================
 Implement the core classes
 --------------------------
 The key is to implement your oracle in a similar way to the ``NodeInterestRates.Oracle`` outline we gave above with
 both ``query`` and ``sign`` methods.  Typically you would want one class that encapsulates the parameters to the ``query``
 method (``FixOf`` above), and a ``CommandData`` implementation (``Fix`` above) that encapsulates both an instance of
 that parameter class and an instance of whatever the result of the ``query`` is (``BigDecimal`` above).
 The ``NodeInterestRates.Oracle`` allows querying for multiple ``Fix``-es but that is not necessary and is
 provided for the convenience of callers who might need multiple and can do it all in one query request.  Likewise
 the *deadline* functionality is optional and can be avoided initially.
 Let's see what parameters we pass to the constructor of this oracle.
 .. sourcecode:: kotlin
   class Oracle(val identity: Party, private val signingKey: KeyPair, val clock: Clock) = TODO()
 Here we see the oracle needs to have its own identity, so it can check which transaction commands it is expected to
 sign for, and also needs a pair of signing keys with which it signs transactions.  The clock is used for the deadline
 functionality which we will not discuss further here.
 Assuming you have a data source and can query it, it should be very easy to implement your ``query`` method and the
 parameter and ``CommandData`` classes.
 Let's see how the ``sign`` method for ``NodeInterestRates.Oracle`` is written:
 .. literalinclude:: ../../samples/irs-demo/src/main/kotlin/net/corda/irs/api/NodeInterestRates.kt
   :language: kotlin
   :start-after: DOCSTART 1
   :end-before: DOCEND 1
 Here we can see that there are several steps:
 1. Ensure that the transaction we have been sent is indeed valid and passes verification, even though we cannot see all
   of it.
 2. Check that we only received commands as expected, and each of those commands expects us to sign for them and is of
   the expected type (``Fix`` here).
 3. Iterate over each of the commands we identified in the last step and check that the data they represent matches
   exactly our data source.  The final step, assuming we have got this far, is to generate a signature for the
   transaction and return it.
 Binding to the network via CorDapp plugin
 -----------------------------------------
 .. note:: Before reading any further, we advise that you understand the concept of flows and how to write them and use
   them. See :doc:`flow-state-machines`.  Likewise some understanding of Cordapps, plugins and services will be helpful.
   See :doc:`creating-a-cordapp`.
 The first step is to create a service to host the oracle on the network.  Let's see how that's implemented:
 .. literalinclude:: ../../samples/irs-demo/src/main/kotlin/net/corda/irs/api/NodeInterestRates.kt
   :language: kotlin
   :start-after: DOCSTART 2
   :end-before: DOCEND 2
 This may look complicated, but really it's made up of some relatively simple elements (in the order they appear in the code):
 1. Accept a ``PluginServiceHub`` in the constructor.  This is your interface to the Corda node.
 2. Ensure you extend the abstract class ``SingletonSerializeAsToken`` (see :doc:`corda-plugins`).
 3. Create an instance of your core oracle class that has the ``query`` and ``sign`` methods as discussed above.
 4. Register your client sub-flows (in this case both in ``RatesFixFlow``.  See the next section) for querying and
   signing as initiating your service flows that actually do the querying and signing using your core oracle class instance.
 5. Implement your service flows that call your core oracle class instance.
 The final step is to register your service with the node via the plugin mechanism. Do this by
 implementing a plugin.  Don't forget the resources file to register it with the ``ServiceLoader`` framework
 (see :doc:`corda-plugins`).
 .. sourcecode:: kotlin
   class Plugin : CordaPluginRegistry() {
        override val servicePlugins: List<Class<*>> = listOf(Service::class.java)
   }
 Providing client sub-flows for querying and signing
 ---------------------------------------------------
 We mentioned the client sub-flow briefly above.  They are the mechanism that clients, in the form of other flows, will
 interact with your oracle.  Typically there will be one for querying and one for signing.  Let's take a look at
 those for ``NodeInterestRates.Oracle``.
 .. literalinclude:: ../../samples/irs-demo/src/main/kotlin/net/corda/irs/flows/RatesFixFlow.kt
   :language: kotlin
   :start-after: DOCSTART 1
   :end-before: DOCEND 1
 You'll note that the ``FixSignFlow`` requires a ``FilterFuns`` instance with the appropriate filter to include only
 the ``Fix`` commands.  You can find a further explanation of this in :doc:`merkle-trees`.
 Using an oracle
 ===============
 The oracle is invoked through sub-flows to query for values, add them to the transaction as commands and then get
 the transaction signed by the the oracle.  Following on from the above examples, this is all encapsulated in a sub-flow
 called ``RatesFixFlow``.  Here's the ``call`` method of that flow.
 .. literalinclude:: ../../samples/irs-demo/src/main/kotlin/net/corda/irs/flows/RatesFixFlow.kt
   :language: kotlin
   :start-after: DOCSTART 2
   :end-before: DOCEND 2
 As you can see, this:
 1. Queries the oracle for the fact using the client sub-flow for querying from above.
 2. Does some quick validation.
 3. Adds the command to the transaction containing the fact to be signed for by the oracle.
 4. Calls an extension point that allows clients to generate output states based on the fact from the oracle.
 5. Requests the signature from the oracle using the client sub-flow for signing from above.
 6. Adds the signature returned from the oracle.
 Here's an example of it in action from ``FixingFlow.Fixer``.
 .. literalinclude:: ../../samples/irs-demo/src/main/kotlin/net/corda/irs/flows/FixingFlow.kt
   :language: kotlin
   :start-after: DOCSTART 1
   :end-before: DOCEND 1
--- a/docs/build/html/_sources/release-notes.txt
+++ b/docs/build/html/_sources/release-notes.txt
@ -3,6 +3,78 @@ Release notes
 Here are brief summaries of what's changed between each snapshot release.
 Milestone 6
 -----------
 * Added the `Corda technical white paper <_static/corda-technical-whitepaper.pdf>`_. Note that its current version
  is 0.5 to reflect the fact that the Corda design is still evolving. Although we expect only relatively small tweaks
  at this point, when Corda reaches 1.0 so will the white paper.
 * Major documentation restructuring and new content:
    * More details on Corda node internals.
    * New CorDapp tutorial.
    * New tutorial on building transactions.
    * New tutorials on how to run and use a notary service.
 * An experimental version of the deterministic JVM sandbox has been added. It is not integrated with the node and will
  undergo some significant changes in the coming releases before it is integrated, as the code is finished, as bugs are
  found and fixed, and as the platform subset we choose to expose is finalised. Treat this as an outline of the basic
  approach rather than something usable for production.
 * Developer experience:
    * Samples have been merged back into the main repository. All samples can now be run via command line or IntelliJ.
    * Added a Client RPC python example.
    * Node console output now displays concise startup information, such as startup time or web address. All logging to
      the console is suppressed apart from errors and flow progress tracker steps. It can be re-enabled by passing
      ``--log-to-console`` command line parameter. Note that the log file remains unchanged an will still contain all
      log entries.
    * The ``runnodes`` scripts generated by the Gradle plugins now open each node in separate terminal windows or (on macOS) tabs.
    * A much more complete template app.
    * JARs now available on Maven Central.
 * Data model: A party is now identified by a composite key (formerly known as a "public key tree") instead of a single public key.
  Read more in :ref:`composite-keys`. This allows expressing distributed service identities, e.g. a distributed notary.
  In the future this will also allow parties to use multiple signing keys for their legal identity.
 * Decentralised consensus: A prototype RAFT based notary composed of multiple nodes has been added. This implementation
  is optimised for high performance over robustness against malicious cluster members, which may be appropriate for
  some financial situations. See :ref:`notary-demo` to try it out. A BFT notary will be added later.
 * Node explorer app:
    * New theme aligned with the Corda branding.
    * The New Transaction screen moved to the Cash View (as it is used solely for cash transactions)
    * Removed state machine/flow information from Transaction table. A new view for this will be created in a future release.
    * Added a new Network View that displays details of all nodes on the network.
    * Users can now configure the reporting currency in settings.
    * Various layout and performance enhancements.
 * Client RPC:
    * Added a generic ``startFlow`` method that enables starting of any flow, given sufficient permissions.
    * Added the ability for plugins to register additional classes or custom serialisers with Kryo for use in RPC.
    * ``rpc-users.properties`` file has been removed with RPC user settings moved to the config file.
 * Configuration changes: It is now possible to specify a custom legal name for any of the node's advertised services.
 * Added a load testing framework which allows stress testing of a node cluster, as well as specifying different ways of
  disrupting the normal operation of nodes. See :doc:`loadtesting`.
 * Improvements to the experimental contract DSL, by Sofus Mortensen of Nordea Bank (please give Nordea a shoutout too).
 API changes:
 * The top level package has been renamed from ``com.r3corda`` to ``net.corda``.
 * Protocols have been renamed to "flows".
 * ``OpaqueBytes`` now uses ``bytes`` as the field name rather than ``bits``.
 Milestone 5
 -----------
--- a/docs/build/html/_sources/running-the-demos.txt
+++ b/docs/build/html/_sources/running-the-demos.txt
@ -16,15 +16,21 @@ so far. We have:
 .. note:: If any demos don't work please jump on our mailing list and let us know.
 Important : Common Instructions for all demos
 ---------------------------------------------
 The demos can be run either from the command line, or from inside IntelliJ. Running from the command line is
 recommended if you are just wanting to see them run, using IntelliJ can be helpful if you want to debug or
-develop the demos themselves.
+develop the demos themselves. For more details about running via the command line or within IntelliJ - see :doc:`CLI-vs-IDE`.
 *For all demos:* The ``install`` gradle task is automatically ran if required; this no longer needs to be run independently.
 Trader demo
 -----------
 This demo brings up three nodes: Bank A, Bank B and a notary/network map node that they both use. Bank A will
-be the buyer, and self-issues some cash in order to acquire the commercial paper from Bank B, the seller.
+be the buyer, and self-issues some cash in order to acquire commercial paper from Bank B, the seller.
 To run from the command line:
@ -54,7 +60,7 @@ on a simulated clock passes.
 To run from the command line:
-1. Run ``./gradlew samples:irs-demo:deployNodes samples:irs-demo:installDist`` to install configs and a command line tool under ``samples/irs-demo/build``.
+1. Run ``./gradlew samples:irs-demo:deployNodes`` to install configs and a command line tool under ``samples/irs-demo/build``.
 2. Change to the ``samples/irs-demo/build`` directory.
 3. Run ``./nodes/runnodes`` (or ``runnodes.bat`` on Windows) to open up three new terminals with the three nodes.
 4. Run ``./install/irs-demo/bin/irs-demo --role UploadRates`` (or use ``irs-demo.bat`` on Windows). You should see a
@ -104,19 +110,6 @@ Or you can run them from inside IntelliJ, but when done this way, all the node o
 In the "Attachment Demo: Run Nodes" window you should see some log lines scroll past, and within a few seconds the
 message "File received - we're happy!" should be printed.
 SIMM and Portfolio demo
 -----------------------
 .. note:: Read more about this demo at :doc:`initial-margin-agreement`.
 To run the demo run:
 1. Open the Corda project in IntelliJ and run the "Install" configuration
 2. Open the Corda samples project in IntelliJ and run the "Simm Valuation Demo" configuration
 Now open http://localhost:10005/web/simmvaluationdemo and http://localhost:10007/web/simmvaluationdemo to view the two nodes that this
 will have started respectively. You can now use the demo by creating trades and agreeing the valuations.
 .. _notary-demo:
 Distributed Notary demo
@ -162,3 +155,95 @@ by using the H2 web console:
  You will be presented with a web application that enumerates all the available tables and provides an interface for you to query them using SQL.
 - The committed states are stored in the ``NOTARY_COMMITTED_STATES`` table. Note that the raw data is not human-readable,
  but we're only interested in the row count for this demo.
 SIMM and Portfolio Demo - aka the Initial Margin Agreement Demo
 ---------------------------------------------------------------
 Background and SIMM Introduction
 ********************************
 This app is a demonstration of how Corda can be used for the real world requirement of initial margin calculation and
 agreement; featuring the integration of complex and industry proven third party libraries into Corda nodes.
 SIMM is an acronym for "Standard Initial Margin Model". It is effectively the calculation of a "margin" that is paid
 by one party to another when they agree a trade on certain types of transaction. This margin is
 paid such that, in the event of one of the counterparties suffering a credit event
 (a financial term and a polite way to say defaulting, not paying the debts that are due, or potentially even bankruptcy),
 then the party that is owed any sum already has some of the amount that it should have been paid. This payment to the
 receiving party is a preventative measure in order to reduce the risk of a potentially catastrophic default domino
 effect that caused the `Great Financial Crisis <https://en.wikipedia.org/wiki/Financial_crisis_of_2007%E2%80%932008>`_,
 as it means that they can be assured that if they need to pay another party, they will have a proportion of the funds
 that they have been relying on.
 To enact this, in September 2016, the ISDA committee - with full backing from various governing bodies -
 `issued a ruling on what is known as the ISDA SIMM ™ model <http://www2.isda.org/news/isda-simm-deployed-today-new-industry-standard-for-calculating-initial-margin-widely-adopted-by-market-participants>`_,
 a way of fairly and consistently calculating this margin. Any parties wishing to trade a financial product that is
 covered under this ruling would, independently, use this model and calculate their margin payment requirement,
 agree it with their trading counterparty and then pay (or receive, depending on the results of this calculation)
 this amount. In the case of disagreement that is not resolved in a timely fashion, this payment would increase
 and so therefore it is in the parties' interest to reach agreement in as short as time frame as possible.
 To be more accurate, the SIMM calculation is not performed on just one trade - it is calculated on an aggregate of
 intermediary values (which in this model are sensitivities to risk factors) from a portfolio of trades; therefore
 the input to a SIMM is actually this data, not the individual trades themselves.
 Also note that implementations of the SIMM are actually protected and subject to license restrictions by ISDA
 (this is due to the model itself being protected). We were fortunate enough to technically partner with
 `OpenGamma <http://www.opengamma.com>`_  who allowed us to demonstrate the SIMM process using their proprietary model.
 In the source code released, we have replaced their analytics engine with very simple stub functions that allow
 the process to run without actually calculating correct values, and can easily be swapped out in place for their real libraries.
 Open the Corda samples project in IntelliJ and run the "Simm Valuation Demo" configuration
 Now open http://localhost:10005/web/simmvaluationdemo and http://localhost:10007/web/simmvaluationdemo to view the two
 nodes that this will have started respectively. You can now use the demo by creating trades and agreeing the valuations.
 Also see the README located in samples/simm-valuation-demo.
 What happens in the demo (notionally)
 *************************************
 Preliminaries
    - Ensure that there are a number of live trades with another party financial products that are covered under the
      ISDA SIMM agreement (if none, then use the demo to enter some simple trades as described below).
 Initial Margin Agreement Process
    - Agree that one will be performing the margining calculation against a portfolio of trades with another party, and agree the trades in that portfolio. In practice, one node will start the flow but it does not matter which node does.
    - Individually (at the node level), identify the data (static, reference etc) one will need in order to be able to calculate the metrics on those trades
    - Confirm with the other counterparty the dataset from the above set
    - Calculate any intermediary steps and values needed for the margin calculation (ie sensitivities to risk factors)
    - Agree on the results of these steps
    - Calculate the initial margin
    - Agree on the calculation of the above with the other party
    - In practice, pay (or receive) this margin (omitted for the sake of complexity for this example)
 Demo execution (step by step)
 *****************************
 The demonstration can be run in two ways - via IntelliJ (which will allow you to add breakpoints, debug, etc), or via gradle and the command line.
 Run with IntelliJ
    1. Open the ``corda`` project with IntelliJ
    2. Run the shared run configuration "SIMM Valuation Demo"
 Run via CLI
    1. Navigate to the ``samples/simm-valuation-demo`` directory in your shell
    2. Run the gradle target ``deployNodes`` (ie; ``./gradlew deployNodes`` for Unix or ``gradlew.bat`` on Windows)
        a. Unix: ``cd simm-valuation-demo/build/nodes && ./runnodes``
        b. Windows: ``cd simm-valuation-demo/build/nodes & runnodes.bat``
 Then (for both)
    3. Browse to http://localhost:10005/web/simmvaluationdemo
    4. Select the other counterparty (ie Bank B)
    5. Enter at least 3 trades - via the "Create New Trade" tab.
    6. On the "Agree Valuations" tab, click the "Start Calculations" button.
 Additionally, you can confirm that these trades are not visible from `Bank C's node <http://localhost:10009/web/simmvaluationdemo/>`_.
 Please note that any URL text after `simmvaluationdemo` should not be bookmarked or navigated directly to as they are only for aesthetics.
--- a/docs/build/html/_sources/transaction-data-types.txt
+++ b/docs/build/html/_sources/transaction-data-types.txt
@ -145,6 +145,8 @@ that has been signed by a set of parties.
 .. note:: These types are provisional and will change significantly in future as the identity framework becomes more
   fleshed out.
 .. _composite-keys:
 Multi-signature support
 -----------------------
--- a/docs/build/html/_sources/tutorial-building-transactions.txt
+++ b/docs/build/html/_sources/tutorial-building-transactions.txt
@ -0,0 +1,321 @@
 Building Transactions
 =====================
 Introduction
 ------------
 Understanding and implementing transactions in Corda is key to building 
 and implementing real world smart contracts. It is only through 
 construction of valid Corda transactions containing appropriate data 
 that nodes on the ledger can map real world business objects into a 
 shared digital view of the data in the Corda ledger. More importantly as 
 the developer of new smart contracts it is the code which determines 
 what data is well formed and what data should be rejected as mistakes, 
 or to prevent malicious activity. This document details some of the 
 considerations and APIs used to when constructing transactions as part 
 of a flow. 
 The Basic Lifecycle Of Transactions
 -----------------------------------
 Transactions in Corda are constructed in stages and contain a number of 
 elements. In particular a transaction’s core data structure is the 
 ``net.corda.core.transactions.WireTransaction``, which is usually 
 manipulated via a 
 ``net.corda.core.contracts.General.TransactionBuilder`` and contains: 
 1. A set of Input state references that will be consumed by the final 
 accepted transaction. 
 2. A set of Output states to create/replace the consumed states and thus 
 become the new latest versions of data on the ledger. 
 3. A set of ``Attachment`` items which can contain legal documents, contract 
 code, or private encrypted sections as an extension beyond the native 
 contract states. 
 4. A set of ``Command`` items which give a context to the type of ledger 
 transition that is encoded in the transaction. Also each command has an 
 associated set of signer keys, which will be required to sign the 
 transaction. 
 5. A signers list, which is populated by the ``TransactionBuilder`` to 
 be the union of the signers on the individual Command objects. 
 6. A notary identity to specify the Notary node which is tracking the 
 state consumption. (If the input states are registered with different 
 notary nodes the flow will have to insert additional ``NotaryChange`` 
 transactions to migrate the states across to a consistent notary node, 
 before being allowed to mutate any states.) 
 7. Optionally a timestamp that can used in the Notary to time bound the 
 period in which the proposed transaction stays valid. 
 Typically, the ``WireTransaction`` should be regarded as a proposal and 
 may need to be exchanged back and forth between parties before it can be 
 fully populated. This is an immediate consequence of the Corda privacy 
 model, which means that the input states are likely to be unknown to the 
 other node. 
 Once the proposed data is fully populated the flow code should freeze 
 the ``WireTransaction`` and form a ``SignedTransaction``. This is key to 
 the ledger agreement process, as once a flow has attached a node’s 
 signature it has stated that all details of the transaction are 
 acceptable to it. A flow should take care not to attach signatures to 
 intermediate data, which might be maliciously used to construct a 
 different ``SignedTransaction``. For instance in a foreign exchange 
 scenario we shouldn't send a ``SignedTransaction`` with only our sell 
 side populated as that could be used to take the money without the 
 expected return of the other currency. Also, it is best practice for 
 flows to receive back the ``DigitalSignature.WithKey`` of other parties 
 rather than a full ``SignedTransaction`` objects, because otherwise we 
 have to separately check that this is still the same 
 ``SignedTransaction`` and not a malicious substitute. 
 The final stage of committing the transaction to the ledger is to 
 notarise the ``SignedTransaction``, distribute this to all appropriate 
 parties and record the data into the ledger. These actions are best 
 delegated to the ``FinalityFlow``, rather than calling the inidividual 
 steps manually. However, do note that the final broadcast to the other 
 nodes is asynchronous, so care must be used in unit testing to 
 correctly await the Vault updates. 
 Gathering Inputs
 ----------------
 One of the first steps to forming a transaction is gathering the set of 
 input references. This process will clearly vary according to the nature 
 of the business process being captured by the smart contract and the 
 parameterised details of the request. However, it will generally involve 
 searching the Vault via the ``VaultService`` interface on the 
 ``ServiceHub`` to locate the input states.
 To give a few more specific details consider two simplified real world 
 scenarios. First, a basic foreign exchange Cash transaction. This 
 transaction needs to locate a set of funds to exchange. A flow 
 modelling this is implemented in ``FxTransactionBuildTutorial.kt``. 
 Second, a simple business model in which parties manually accept, or 
 reject each other's trade proposals which is implemented in 
 ``WorkflowTransactionBuildTutorial.kt``. To run and explore these 
 examples using the IntelliJ IDE one can run/step the respective unit 
 tests in ``FxTransactionBuildTutorialTest.kt`` and 
 ``WorkflowTransactionBuildTutorialTest.kt``, which drive the flows as 
 part of a simulated in-memory network of nodes. When creating the 
 IntelliJ run configuration for these unit test set the workspace 
 points to the root ``r3prototyping`` folder and add 
 ``-javaagent:lib/quasar.jar`` to the VM options, so that the ``Quasar`` 
 instrumentation is correctly configured. 
 For the Cash transaction let’s assume the cash resources are using the 
 standard ``CashState`` in the ``:financial`` Gradle module. The Cash 
 contract uses ``FungibleAsset`` states to model holdings of 
 interchangeable assets and allow the split/merge and summing of 
 states to meet a contractual obligation. We would normally use the 
 ``generateSpend`` method on the ``VaultService`` to gather the required 
 amount of cash into a ``TransactionBuilder``, set the outputs and move 
 command. However, to elucidate more clearly example flow code is shown 
 here that will manually carry out the inputs queries using the lower 
 level ``VaultService``. 
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/FxTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 1
    :end-before: DOCEND 1
 As a foreign exchange transaction we expect an exchange of two 
 currencies, so we will also require a set of input states from the other 
 counterparty. However, the Corda privacy model means we do not know the 
 other node’s states. Our flow must therefore negotiate with the other 
 node for them to carry out a similar query and populate the inputs (See 
 the ``ForeignExchangeFlow`` for more details of the exchange). Having 
 identified a set of Input ``StateRef`` items we can then create the 
 output as discussed below. 
 For the trade approval flow we need to implement a simple workflow 
 pattern. We start by recording the unconfirmed trade details in a state 
 object implementing the ``LinearState`` interface. One field of this 
 record is used to map the business workflow to an enumerated state. 
 Initially the initiator creates a new state object which receives a new 
 ``UniqueIdentifier`` in its ``linearId`` property and a starting 
 workflow state of ``NEW``. The ``Contract.verify`` method is written to 
 allow the initiator to sign this initial transaction and send it to the 
 other party. This pattern ensures that a permanent copy is recorded on 
 both ledgers for audit purposes, but the state is prevented from being 
 maliciously put in an approved state. The subsequent workflow steps then 
 follow with transactions that consume the state as inputs on one side 
 and output a new version with whatever state updates, or amendments 
 match to the business process, the ``linearId`` being preserved across 
 the changes. Attached ``Command`` objects help the verify method 
 restrict changes to appropriate fields and signers at each step in the 
 workflow. In this it is typical to have both parties sign the change 
 transactions, but it can be valid to allow unilateral signing, if for instance 
 one side could block a rejection. Commonly the manual initiator of these 
 workflows will query the Vault for states of the right contract type and 
 in the right workflow state over the RPC interface. The RPC will then 
 initiate the relevant flow using ``StateRef``, or ``linearId`` values as 
 parameters to the flow to identify the states being operated upon. Thus
 code to gather the latest input state would be:
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/WorkflowTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 1
    :end-before: DOCEND 1
 .. container:: codeset
   .. sourcecode:: kotlin
      // Pull in the latest Vault version of the StateRef as a full StateAndRef
      val latestRecord = serviceHub.latest<TradeApprovalContract.State>(ref)
 Generating Commands
 -------------------
 For the commands that will be added to the transaction, these will need 
 to correctly reflect the task at hand. These must match because inside 
 the ``Contract.verify`` method the command will be used to select the 
 validation code path. The ``Contract.verify`` method will then restrict 
 the allowed contents of the transaction to reflect this context. Typical 
 restrictions might include that the input cash amount must equal the 
 output cash amount, or that a workflow step is only allowed to change 
 the status field. Sometimes, the command may capture some data too e.g. 
 the foreign exchange rate, or the identity of one party, or the StateRef 
 of the specific input that originates the command in a bulk operation. 
 This data will be used to further aid the ``Contract.verify``, because 
 to ensure consistent, secure and reproducible behaviour in a distributed 
 environment the ``Contract.verify``, transaction is the only allowed to 
 use the content of the transaction to decide validity. 
 Another essential requirement for commands is that the correct set of 
 ``CompositeKeys`` are added to the Command on the builder, which will be 
 used to form the set of required signers on the final validated 
 transaction. These must correctly align with the expectations of the 
 ``Contract.verify`` method, which should be written to defensively check 
 this. In particular, it is expected that at minimum the owner of an 
 asset would have to be signing to permission transfer of that asset. In 
 addition, other signatories will often be required e.g. an Oracle 
 identity for an Oracle command, or both parties when there is an 
 exchange of assets. 
 Generating Outputs
 ------------------
 Having located a set of ``StateAndRefs`` as the transaction inputs, the 
 flow has to generate the output states. Typically, this is a simple call 
 to the Kotlin ``copy`` method to modify the few fields that will 
 transitioned in the transaction. The contract code may provide a 
 ``generateXXX`` method to help with this process if the task is more 
 complicated. With a workflow state a slightly modified copy state is 
 usually sufficient, especially as it is expected that we wish to preserve 
 the ``linearId`` between state revisions, so that Vault queries can find 
 the latest revision.
 For fungible contract states such as ``Cash`` it is common to distribute 
 and split the total amount e.g. to produce a remaining balance output 
 state for the original owner when breaking up a large amount input 
 state. Remember that the result of a successful transaction is always to 
 fully consume/spend the input states, so this is required to conserve 
 the total cash. For example from the demo code: 
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/FxTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 2
    :end-before: DOCEND 2
 Building the WireTransaction
 ----------------------------
 Having gathered all the ingredients for the transaction we now need to 
 use a ``TransactionBuilder`` to construct the full ``WireTransaction``. 
 The initial ``TransactionBuilder`` should be created by calling the 
 ``TransactionType.General.Builder`` method. (The other 
 ``TransactionBuilder`` implementation is only used for the ``NotaryChange`` flow where 
 ``ContractStates`` need moving to a different Notary.) At this point the 
 Notary to associate with the states should be recorded. Then we keep 
 adding inputs, outputs, commands and attachments to fill the 
 transaction. Examples of this process are: 
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/WorkflowTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 2
    :end-before: DOCEND 2
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/FxTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 3
    :end-before: DOCEND 3
 Completing the SignedTransaction
 --------------------------------
 Having created an initial ``WireTransaction`` and converted this to an 
 initial ``SignedTransaction`` the process of verifying and forming a 
 full ``SignedTransaction`` begins and then completes with the 
 notarisation. In practice this is a relatively stereotypical process, 
 because assuming the ``WireTransaction`` is correctly constructed the 
 verification should be immediate. However, it is also important to 
 recheck the business details of any data received back from an external 
 node, because a malicious party could always modify the contents before 
 returning the transaction. Each remote flow should therefore check as 
 much as possible of the initial ``SignedTransaction`` inside the ``unwrap`` of 
 the receive before agreeing to sign. Any issues should immediately throw 
 an exception to abort the flow. Similarly the originator, should always 
 apply any new signatures to its original proposal to ensure the contents 
 of the transaction has not been altered by the remote parties.
 The typical code therefore checks the received ``SignedTransaction`` 
 using the ``verifySignatures`` method, but excluding itself, the notary 
 and any other parties yet to apply their signature. The contents of the 
 ``WireTransaction`` inside the ``SignedTransaction`` should be fully 
 verified further by expanding with ``toLedgerTransaction`` and calling 
 ``verify``. Further context specific and business checks should then be 
 made, because the ``Contract.verify`` is not allowed to access external 
 context. For example the flow may need to check that the parties are the 
 right ones, or that the ``Command`` present on the transaction is as 
 expected for this specific flow. An example of this from the demo code is: 
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/WorkflowTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 3
    :end-before: DOCEND 3
 After verification the remote flow will return its signature to the 
 originator. The originator should apply that signature to the starting 
 ``SignedTransaction`` and recheck the signatures match.
 Committing the Transaction
 --------------------------
 Once all the party signatures are applied to the SignedTransaction the 
 final step is notarisation. This involves calling ``NotaryFlow.Client`` 
 to confirm the transaction, consume the inputs and return its confirming 
 signature. Then the flow should ensure that all nodes end with all 
 signatures and that they call ``ServiceHub.recordTransactions``. The 
 code for this is standardised in the ``FinalityFlow``, or more explictly 
 an example is: 
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/WorkflowTransactionBuildTutorial.kt
    :language: kotlin
    :start-after: DOCSTART 4
    :end-before: DOCEND 4
 Partially Visible Transactions
 ------------------------------
 The discussion so far has assumed that the parties need full visibility 
 of the transaction to sign. However, there may be situations where each 
 party needs to store private data for audit purposes, or for evidence to 
 a regulator, but does not wish to share that with the other trading 
 partner. The tear-off/Merkle tree support in Corda allows flows to send 
 portions of the full transaction to restrict visibility to remote 
 parties. To do this one can use the 
 ``WireTransaction.buildFilteredTransaction`` extension method to produce 
 a ``FilteredTransaction``. The elements of the ``SignedTransaction`` 
 which we wish to be hide will be replaced with their secure hash. The 
 overall transaction txid is still provable from the 
 ``FilteredTransaction`` preventing change of the private data, but we do 
 not expose that data to the other node directly. A full example of this 
 can be found in the ``NodeInterestRates`` Oracle code from the 
 ``irs-demo`` project which interacts with the ``RatesFixFlow`` flow. 
 Also, refer to the :doc:`merkle-trees` documentation. 
--- a/docs/build/html/_sources/tutorial-clientrpc-api.txt
+++ b/docs/build/html/_sources/tutorial-clientrpc-api.txt
@ -32,9 +32,12 @@ We start generating transactions in a different thread (``generateTransactions``
    :start-after: interface CordaRPCOps
    :end-before: }
 .. warning:: This API is evolving and will continue to grow as new functionality and features added to Corda are made available to RPC clients.
 The one we need in order to dump the transaction graph is ``verifiedTransactions``. The type signature tells us that the
 RPC will return a list of transactions and an Observable stream. This is a general pattern, we query some data and the
-node will return the current snapshot and future updates done to it.
+node will return the current snapshot and future updates done to it. Observables are described in further detail in
 :doc:`clientrpc`
 .. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
@ -66,7 +69,7 @@ The RPC we need to initiate a Cash transaction is ``startFlowDynamic`` which may
 Finally we have everything in place: we start a couple of nodes, connect to them, and start creating transactions while listening on successfully created ones, which are dumped to the console. We just need to run it!:
-.. sourcecode:: bash
+.. code-block:: text
    # Build the example
    ./gradlew docs/source/example-code:installDist
@ -97,3 +100,53 @@ See more on plugins in :doc:`creating-a-cordapp`.
 .. warning:: We will be replacing the use of Kryo in RPC with a stable message format and this will mean that this plugin
    customisation point will either go away completely or change.
 Security
 --------
 RPC credentials associated with a Client must match the permission set configured on the server Node.
 This refers to both authentication (username and password) and role-based authorisation (a permissioned set of RPC operations an
 authenticated user is entitled to run).
 .. note:: Permissions are represented as *String's* to allow RPC implementations to add their own permissioning.
     Currently the only permission type defined is *StartFlow*, which defines a list of whitelisted flows an authenticated use may execute.
 In the instructions above the server node permissions are configured programmatically in the driver code:
 .. code-block:: text
        driver(driverDirectory = baseDirectory) {
            val user = User("user", "password", permissions = setOf(startFlowPermission<CashFlow>()))
            val node = startNode("Alice", rpcUsers = listOf(user)).get()
 When starting a standalone node using a configuration file we must supply the RPC credentials as follows:
 .. code-block:: text
    rpcUsers : [
        { user=user, password=password, permissions=[ StartFlow.net.corda.flows.CashFlow ] }
    ]
 When using the gradle Cordformation plugin to configure and deploy a node you must supply the RPC credentials in a similar manner:
 .. code-block:: text
        rpcUsers = [
                ['user' : "user",
                 'password' : "password",
                 'permissions' : ["StartFlow.net.corda.flows.CashFlow"]]
        ]
 You can then deploy and launch the nodes (Notary and Alice) as follows:
 .. code-block:: text
    # to create a set of configs and installs under ``docs/source/example-code/build/nodes`` run
    ./gradlew docs/source/example-code:deployNodes
    # to open up two new terminals with the two nodes run
    ./docs/source/example-code/build/nodes/runnodes
    # followed by the same commands as before:
    ./docs/source/example-code/build/install/docs/source/example-code/bin/client-rpc-tutorial Print
    ./docs/source/example-code/build/install/docs/source/example-code/bin/client-rpc-tutorial Visualise
 See more on security in :doc:`secure-coding-guidelines`,  node configuration in :doc:`corda-configuration-file` and
 Cordformation in :doc:`creating-a-cordapp`
--- a/docs/build/html/_sources/tutorial-contract-clauses.txt
+++ b/docs/build/html/_sources/tutorial-contract-clauses.txt
@ -9,34 +9,48 @@ Writing a contract using clauses
 This tutorial will take you through restructuring the commercial paper contract to use clauses. You should have
 already completed ":doc:`tutorial-contract`".
 As before, the example is focused on basic implementation of commercial paper, which is essentially a simpler version of a corporate
 bond. A company issues CP with a particular face value, say $100, but sells it for less, say $90. The paper can be redeemed
 for cash at a given date in the future. Thus this example would have a 10% interest rate with a single repayment.
 Whole Kotlin code can be found in ``CommercialPaper.kt``.
 What are clauses and why to use them?
 -------------------------------------
 Clauses are essentially micro-contracts which contain independent verification logic, and can be logically composed
-together to form a contract. Clauses are designed to enable re-use of common logic, for example issuing state objects
+together to form a contract. Clauses are designed to enable re-use of common verification parts, for example issuing state objects
 is generally the same for all fungible contracts, so a common issuance clause can be inherited for each contract's
 issue clause. This cuts down on scope for error, and improves consistency of behaviour. By splitting verification logic
 into smaller chunks, they can also be readily tested in isolation.
-Clauses can be composed of subclauses, for example the ``AllClause`` or ``AnyClause`` clauses take list of clauses
+How clauses work?
-that they delegate to. Clauses can also change the scope of states and commands being verified, for example grouping
+-----------------
 together fungible state objects and running a clause against each distinct group.
-The commercial paper contract has a ``Group`` outermost clause, which contains the ``Issue``, ``Move`` and ``Redeem``
+We have different types of clauses, the most basic are the ones that define verification logic for particular command set.
-clauses. The result is a contract that looks something like this:
+We will see them later as elementary building blocks that commercial paper consist of - ``Move``, ``Issue`` and ``Redeem``.
 As a developer you need to identify reusable parts of your contract and decide how they should be combined. It is where
 composite clauses become useful. They gather many clause subcomponents and resolve how and which of them should be checked.
-    1. Group input and output states together, and then apply the following clauses on each group:
+For example, assume that we want to verify a transaction using all constraints defined in separate clauses. We need to
-        a. If an ``Issue`` command is present, run appropriate tests and end processing this group.
+wrap classes that define them into ``AllComposition`` composite clause. It assures that all clauses from that combination
-        b. If a ``Move`` command is present, run appropriate tests and end processing this group.
+match with commands in a transaction - only then verification logic can be executed.
-        c. If a ``Redeem`` command is present, run appropriate tests and end processing this group.
+It may be a little confusing, but composite clause is also a clause and you can even wrap it in the special grouping clause.
 In ``CommercialPaper`` it looks like that:
 .. image:: resources/commPaperClauses.png
 The most basic types of composite clauses are ``AllComposition``, ``AnyComposition`` and ``FirstComposition``.
 In this tutorial we will use ``GroupClauseVerifier`` and ``AnyComposition``. It's important to understand how they work.
 Charts showing execution and more detailed information can be found in :doc:`clauses`.
 .. _verify_ref:
 Commercial paper class
 ----------------------
-To use the clause verification logic, the contract needs to call the ``verifyClause`` function, passing in the
+We start from defining ``CommercialPaper`` class. As in previous tutorial we need some elementary parts: ``Commands`` interface,
-transaction, a clause to verify, and a collection of commands the clauses are expected to handle all of. This list of
+``generateMove``, ``generateIssue``, ``generateRedeem`` - so far so good that stays the same. The new part is verification and
-commands is important because ``verifyClause`` checks that none of the commands are left unprocessed at the end, and
+``Clauses`` interface (you will see them later in code). Let's start from the basic structure:
 raises an error if they are. The top level clause would normally be a composite clause (such as ``AnyComposition``,
 ``AllComposition``, etc.) which contains further clauses. The following examples are trimmed to the modified class
 definition and added elements, for brevity:
 .. container:: codeset
@ -47,6 +61,12 @@ definition and added elements, for brevity:
            override fun verify(tx: TransactionForContract) = verifyClause(tx, Clauses.Group(), tx.commands.select<Commands>())
            interface Commands : CommandData {
                data class Move(override val contractHash: SecureHash? = null) : FungibleAsset.Commands.Move, Commands
                class Redeem : TypeOnlyCommandData(), Commands
                data class Issue(override val nonce: Long = random63BitValue()) : IssueCommand, Commands
            }
   .. sourcecode:: java
      public class CommercialPaper implements Contract {
@ -60,26 +80,41 @@ definition and added elements, for brevity:
              ClauseVerifier.verifyClause(tx, new Clauses.Group(), extractCommands(tx));
          }
-Clauses
+        public interface Commands extends CommandData {
-------
+            class Move implements Commands {
                @Override
                public boolean equals(Object obj) { return obj instanceof Move; }
            }
-We'll tackle the inner clauses that contain the bulk of the verification logic, first, and the clause which handles
+            class Redeem implements Commands {
-grouping of input/output states later. The clauses must extend the ``Clause`` abstract class, which defines
+                @Override
-the ``verify`` function, and the ``requiredCommands`` property used to determine the conditions under which a clause
+                public boolean equals(Object obj) { return obj instanceof Redeem; }
-is triggered. Composite clauses should extend the ``CompositeClause`` abstract class, which extends ``Clause`` to
+            }
 add support for wrapping around multiple clauses.
-The ``verify`` function defined in the ``Clause`` interface is similar to the conventional ``Contract`` verification
+            class Issue implements Commands {
-function, although it adds new parameters and returns the set of commands which it has processed. Normally this returned
+                @Override
-set is identical to the ``requiredCommands`` used to trigger the clause, however in some cases the clause may process
+                public boolean equals(Object obj) { return obj instanceof Issue; }
-further optional commands which it needs to report that it has handled.
+            }
        }
-The ``Move`` clause for the commercial paper contract is relatively simple, so we will start there:
+As you can see we used ``verifyClause`` function with ``Clauses.Group()`` in place of previous verification.
 It's an entry point to running clause logic. ``verifyClause`` takes the transaction, a clause (usually a composite one)
 to verify, and a collection of commands the clause is expected to handle all of. This list of commands is important because
 ``verifyClause`` checks that none of the commands are left unprocessed at the end, and raises an error if they are.
 Simple Clauses
 --------------
 Let's move to constructing contract logic in terms of clauses language. Commercial paper contract has three commands and
 three corresponding behaviours: ``Issue``, ``Move`` and ``Redeem``. Each of them has a specific set of requirements that must be satisfied -
 perfect material for defining clauses. For brevity we will show only ``Move`` clause, rest is constructed in similar manner
 and included in the ``CommercialPaper.kt`` code.
 .. container:: codeset
   .. sourcecode:: kotlin
        interface Clauses {
            class Move: Clause<State, Commands, Issued<Terms>>() {
                override val requiredCommands: Set<Class<out CommandData>>
                    get() = setOf(Commands.Move::class.java)
@ -100,9 +135,11 @@ The ``Move`` clause for the commercial paper contract is relatively simple, so w
                    return setOf(command.value)
                }
            }
            ...
   .. sourcecode:: java
        public interface Clauses {
            class Move extends Clause<State, Commands, State> {
                @NotNull
                @Override
@ -133,15 +170,45 @@ The ``Move`` clause for the commercial paper contract is relatively simple, so w
                    return Collections.singleton(cmd.getValue());
                }
            }
            ...
 We took part of code for ``Command.Move`` verification from previous tutorial and put it into the verify function
 of ``Move`` class. Notice that this class must extend the ``Clause`` abstract class, which defines
 the ``verify`` function, and the ``requiredCommands`` property used to determine the conditions under which a clause
 is triggered. In the above example it means that the clause will run verification when the ``Commands.Move`` is present in a transaction.
 .. note:: Notice that commands refer to all input and output states in a transaction. For clause to be executed, transaction has
    to include all commands from ``requiredCommands`` set.
 Few important changes:
 -   ``verify`` function returns the set of commands which it has processed. Normally this returned set is identical to the
    ``requiredCommands`` used to trigger the clause, however in some cases the clause may process further optional commands
    which it needs to report that it has handled.
 -   Verification takes new parameters. Usually inputs and outputs are some subset of the original transaction entries
    passed to the clause by outer composite or grouping clause. ``groupingKey`` is a key used to group original states.
 As a simple example imagine input states:
 1. 1000 GBP issued by Bank of England
 2. 500 GBP issued by Bank of England
 3. 1000 GBP issued by Bank of Scotland
 We will group states by Issuer so in the first group we have inputs 1 and 2, in second group input number 3. Grouping keys are:
 'GBP issued by Bank of England' and 'GBP issued by Bank of Scotland'.
 How the states can be grouped and passed in that form to the ``Move`` clause? That leads us to the concept of ``GroupClauseVerifier``.
 Group clause
 ------------
-We need to wrap the move clause (as well as the issue and redeem clauses - see the relevant contract code for their
+We may have a transaction with similar but unrelated state evolutions which need to be validated independently. It
-full specifications) in an outer clause that understands how to group contract states and objects. For this we extend
+makes sense to check ``Move`` command on groups of related inputs and outputs (see example above). Thus, we need to collect
-the standard ``GroupClauseVerifier`` and specify how to group input/output states, as well as the top-level to run on
+relevant states together.
-each group. As with the top level clause on a contract, this is normally a composite clause that delegates to subclauses.
+For this we extend the standard ``GroupClauseVerifier`` and specify how to group input/output states, as well as the top-level
-
+clause to run on each group. In our example a top-level is a composite clause - ``AnyCompostion`` that delegates verification to
 it's subclasses (wrapped move, issue, redeem). Any in this case means that it will take 0 or more clauses that match transaction commands.
 .. container:: codeset
@ -174,17 +241,20 @@ each group. As with the top level clause on a contract, this is normally a compo
            }
        }
-For the ``CommercialPaper`` contract, this is the top level clause for the contract, and is passed directly into
+For the ``CommercialPaper`` contract, ``Group`` is the main clause for the contract, and is passed directly into
-``verifyClause`` (see the example code at the top of this tutorial).
+``verifyClause`` (see the example code at the top of this tutorial). We used ``groupStates`` function here, it's worth reminding
 how it works: :ref:`state_ref`.
 Summary
 -------
 In summary the top level contract ``CommercialPaper`` specifies a single grouping clause of type
 ``CommercialPaper.Clauses.Group`` which in turn specifies ``GroupClause`` implementations for each type of command
-(``Redeem``, ``Move`` and ``Issue``). This reflects the flow of verification: In order to verify a ``CommercialPaper``
+(``Redeem``, ``Move`` and ``Issue``). This reflects the flow of verification: in order to verify a ``CommercialPaper``
 we first group states, check which commands are specified, and run command-specific verification logic accordingly.
 .. image:: resources/commPaperExecution.png
 Debugging
 ---------
--- a/docs/build/html/_sources/tutorial-contract.txt
+++ b/docs/build/html/_sources/tutorial-contract.txt
@ -321,6 +321,8 @@ The second line does what the code suggests: it searches for a command object th
 ``CommercialPaper.Commands`` supertype, and either returns it, or throws an exception if there's zero or more than one
 such command.
 .. _state_ref:
 Using state groups
 ------------------
--- a/docs/build/html/_sources/tutorial-cordapp.txt
+++ b/docs/build/html/_sources/tutorial-cordapp.txt
@ -0,0 +1,852 @@
 .. highlight:: kotlin
 .. raw:: html
   <script type="text/javascript" src="_static/jquery.js"></script>
   <script type="text/javascript" src="_static/codesets.js"></script>
 The CorDapp Template
 ====================
 This guide covers how to get started with the `cordapp-template`. Please note there are two Corda repositories:
 * ``corda`` which contains the core platform code and sample CorDapps.
 * ``cordapp-template`` which contains a template CorDapp you can use to bootstrap your own CorDapps. It is the subject
  of this tutorial and should help you understand the basics of building a CorDapp.
 We recommend you read the non-technical white paper and technical white paper before you get started with Corda:
 1. `The Introductory white paper <https://docs.corda.r3cev.com/_static/corda-introductory-whitepaper.pdf>`_ describes the
   motivating vision and background of the project. It is the kind of document your boss should read. It describes why the
   project exists and briefly compares it to alternative systems on the market.
 2. `The Technical white paper <https://docs.corda.r3cev.com/_static/corda-technical-whitepaper.pdf>`_ describes the entire
   intended design from beginning to end. It is the kind of document that you should read, or at least, read parts of. Note
   that because the technical white paper describes the intended end state, it does not always align with the implementation.
 Getting started
 ---------------
 There are two ways to get started with the CorDapp template. You can either work from a milestone release of Corda or a
 SNAPSHOT release of Corda.
 **Using a monthly Corda milestone release.** If you wish to develop your CorDapp using the most recent milestone release
 then you can get started simply by cloning the ``cordapp-template`` repository. Gradle will grab all the required dependencies
 for you from our `public Maven repository <https://bintray.com/r3/corda>`_.
 **Using a Corda SNAPSHOT build.** Alternatively, if you wish to work from the master branch of the Corda repo which contains
 the most up-to-date Corda feature set then you will need to clone the ``corda`` repository and publish the latest master
 build (or previously tagged releases) to your local Maven repository. You will then need to ensure that Gradle
 grabs the correct dependencies for you from Maven local by changing the ``corda_version`` in ``build.gradle``. This will be
 covered below in `Using a SNAPSHOT release`_.
 Firstly, follow the :doc:`getting set up <getting-set-up>` page to download the JDK, IntelliJ and git if you didn't
 already have it.
 Working from milestone releases
 -------------------------------
 If you wish to build a CorDapp against a milestone release then please use these instructions.
 The process for developing your CorDapp from a milestone release is the most simple way to get started and is the preferred
 approach.
 We publish all our milestone releases to a public Maven repository on a monthly basis. As such, Gradle will automatically
 grab the appropriately versioned (specified in the ``cordapp-template``'s ``build.gradle`` file) dependencies for you from Maven.
 All you have to do is check out the release tag of the template version you wish to use.
 By default, the ``master`` branch of the ``cordapp-template`` points to a SNAPSHOT release of Corda, this is because it is
 being constantly updated to reflect the changes in the master branch of the `corda` repository.
 .. note:: If you wish to use a SNAPSHOT release then follow the instructions below: `Using a SNAPSHOT release`_.
 To clone the ``cordapp-template`` repository, use the following command:
 ``git clone https://github.com/corda/cordapp-template``
 Now change directories to the freshly cloned repo:
 ``cd cordapp-template``
 To enumerate all the tagged releases. Use:
 ``git tag``
 To checkout a specific tag, use:
 ``git checkout -b [local_branch_name] tags/[tag_name]``
 where ``local_branch_name`` is a name of your choice and ``tag_name`` is the name of the tag you wish to checkout.
 Gradle will handle all the dependencies for you. Now you are now ready to get started `building the CorDapp Template`_.
 Using a SNAPSHOT release
 ------------------------
 If you wish to build a CorDapp against the most current version of Corda, follow these instructions.
 The Corda repository comprises the following folders:
 * **buildSrc** contains necessary gradle plugins to build Corda.
 * **client** contains the RPC client framework.
 * **config** contains logging configurations and the default node configuration file.
 * **core** containing the core Corda libraries such as crypto functions, types for Corda's building blocks: states,
  contracts, transactions, attachments, etc. and some interfaces for nodes and protocols.
 * **docs** contains the Corda docsite in restructured text format as well as the built docs in html. The docs can be
  accessed via ``/docs/index.html`` from the root of the repo.
 * **finance** defines a range of elementary contracts (and associated schemas) and protocols, such as abstract fungible
  assets, cash, obligation and commercial paper.
 * **gradle** contains the gradle wrapper which you'll use to execute gradle commands.
 * **gradle-plugins** contains some additional plugins which we use to deploy Corda nodes.
 * **lib** contains some dependencies.
 * **node** contains anything specifically required for creating, running and managing nodes (eg: node driver, servlets,
  node services, messaging, persistence).
 * **samples** contains all our Corda demos and code samples.
 * **test-utils** contains some utilities for unit testing contracts ( the contracts testing DSL) and protocols (the
  mock network) implementation.
 * **tools** contains the explorer which is a GUI front-end for Corda.
 Firstly navigate to the folder on your machine you wish to clone the Corda repository to. Then use the following command
 to clone the Corda repository:
 ``git clone https://github.com/corda/corda.git``
 Now change directories:
 ``cd corda``
 Once you've cloned the ``corda`` repository and are in the repo directory you have the option to remain on the master
 branch or checkout a specific branch. Use:
 ``git branch --all``
 to enumerate all the branches. To checkout a specific branch, use:
 ``git checkout -b [local_branch_name] origin/[remote_branch_name]``
 where ``local_branch_name`` is a name of your choice and ``remote_branch_name`` is the name of the remote branch you wish
 to checkout.
 .. note:: When working with ``master`` you will have access to the most up-to-date feature set. However you will be
  potentially sacrificing stability. We will endeavour to keep the ``master`` branch of the ``cordapp-template`` repo in sync
  with the ``master`` branch of ``corda`` repo. A milestone tagged release would be more stable for CorDapp development.
 The next step is to publish the Corda JARs to your local Maven repository. By default the Maven local repository can be
 found:
 * ``~/.m2/repository`` on Unix/Mac OS X
 * ``%HOMEPATH%\.m2`` on windows.
 Publishing can be done with running the following Gradle task from the root project directory:
 Unix/Mac OSX: ``./gradlew install``
 Windows: ``gradlew.bat install``
 This will install all required modules, along with sources and JavaDocs to your local Maven repository. The ``version``
 and ``groupid`` of Corda installed to Maven local is specified in the ``build.gradle`` file in the root of the ``corda``
 repository. You shouldn't have to change these values unless you want to publish multiple versions of a SNAPSHOT, e.g.
 if you are trying out new features, in this case you can change ``version`` for each SNAPSHOT you publish.
 .. note:: **A quick point on corda version numbers used by Gradle.**
  In the ``build.gradle`` file for your CorDapp, you can specify the ``corda_version`` to use. It is important that when
  developing your CorDapp that you use the correct version number. For example, when wanting to work from a SNAPSHOT
  release, the release numbers are suffixed with 'SNAPSHOT', e.g. if the latest milestone release is M6 then the
  SNAPSHOT release will be 0.7-SNAPSHOT, and so on. As such, you will set your ``corda_version`` to ``'0.7-SNAPSHOT'``
  in the ``build.gradle`` file in your CorDapp. Gradle will automatically grab the SNAPSHOT dependencies from your local
  Maven repository. Alternatively, if working from a milestone release, you will use the version number only, for example
  ``0.6`` or ``0.7``.
  Lastly, as the Corda repository evolves on a daily basis up until the next milestone release, it is worth nothing that
  the substance of two SNAPSHOT releases of the same number may be different. If you are using a SNAPSHOT and need help
  debugging an error then please tell us the **commit** you are working from. This will help us ascertain the issue.
 As additional feature branches are merged into Corda you can ``git pull`` the new changes from the ``corda`` repository.
 If you are feeling inquisitive, you may also wish to review some of the current feature branches. All new features are
 developed on separate branches. To enumerate all the current branches use:
 ``git branch --all``
 and to check out an open feature branch, use:
 ``git checkout -b [local_branch_name] origin/[branch_name]``
 .. note:: Publishing Corda JARs from unmerged feature branches might cause some unexpected behaviour / broken CorDapps.
  It would also replace any previously published SNAPSHOTS of the same version.
 .. warning:: If you do modify Corda after you have previously published it to Maven local then you must republish your
  SNAPSHOT build such that Maven reflects the changes you have made.
 Once you have published the Corda JARs to your local Maven repository, you are ready to get started building your
 CorDapp using the latest Corda features.
 Opening the CorDapp Template with IntelliJ
 ------------------------------------------
 For those familiar with IntelliJ, you can skip this section.
 As noted in the getting started guide, we recommend using the IntelliJ IDE. Assuming you have already downloaded and
 installed IntelliJ, lets now open the CorDapp Template with IntelliJ.
 **For those completely new to IntelliJ**
 Firstly, load up IntelliJ. A dialogue will appear:
 .. image:: resources/intellij-welcome.png
  :width: 400
 Click open, then navigate to the folder where you cloned the ``cordapp-template`` and click OK.
 Next, IntelliJ will show a bunch of pop-up windows. One of which requires our attention:
 .. image:: resources/unlinked-gradle-project.png
  :width: 400
 Click the 'import gradle project' link. A dialogue will pop-up. Press OK. Gradle will now begin obtianing all the
 project dependencies and perform some indexing. It usually takes a minute or so. If you miss the 'import gradle project'
 dialogue, simply close and re-open IntelliJ again to see it again.
 **Alternative approach**
 Alternatively, one can instruct IntelliJ to create a new project through cloning a repository. From the IntelliJ welcome
 dialogue (shown above), opt to 'check out from version control', then select git and enter the git url for the CorDpp tempalte
 (https://github.com/corda/cordapp-template). You'll then need to import the Gradle project when prompted, as explained above.
 **If you already have IntelliJ open**
 From the ``File`` menu, navigate to ``Open ...`` and then navigate to the directory where you cloned the ``cordapp-template``.
 Alternatively, if you wish to clone from github directly then navigate to ``File > New > Project from existing sources ...``
 and enter the URL to the CorDapp Template (specified above). When instructed, be sure to import the Gradle project when prompted.
 **The Gradle plugin**
 IntelliJ can be used to run Gradle tasks through the Gradle plugin which can be found via ``View > Tool windows > Gradle``.
 All the Gradle projects are listed in the window on the right hand side of the IDE. Click on a project, then 'tasks' to
 see all available Gradle tasks.
 * For the CorDapp Template repo there will only be one Gradle project listed.
 * For the Corda repo there will be many project listed, the root project ``corda`` and associated sub-projects: ``core``,
  ``finance``, ``node``, etc.
 .. note:: It's worth noting that when you change branch in the CorDapp template, the ``corda_version`` will change to
   reflect the version of the branch you are working from.
 To execute a task, double click it. The output will be shown in a console window.
 Building the CorDapp template
 =============================
 **From the command line**
 Firstly, return to your terminal window used above and make sure you are in the ``cordapp-template`` directory.
 To build the CorDapp template use the following command:
 Unix/Mac OSX: ``./gradlew deployNodes``
 Windows: ``gradlew.bat deployNodes``
 Building straight away will build the example CorDapp defined the the CorDapp template source. For more information on the example
 CorDapp see "The Example CorDapp" section below. Gradle will then grab all the dependencies for you and build the
 example CorDapp.
 The ``deployNodes`` Gradle task allows you easily create a formation of Corda nodes. In the case of the example CorDapp
 we are creating ``four`` nodes.
 After the building process has finished to see the newly built nodes, you can navigate to the ``/build/nodes`` folder
 located in the ``cordapp-template`` root directory. You can ignore the other folders in ``/build`` for now. The ``nodes``
 folder has the following structure:
 .. sourcecode:: none
    . nodes
    ├── controller
    │   ├── corda.jar
    │   ├── dependencies
    │   ├── node.conf
    │   └── plugins
    ├── nodea
    │   ├── corda.jar
    │   ├── dependencies
    │   ├── node.conf
    │   └── plugins
    ├── nodeb
    │   ├── corda.jar
    │   ├── dependencies
    │   ├── node.conf
    │   └── plugins
    ├── nodec
    │   ├── corda.jar
    │   ├── dependencies
    │   ├── node.conf
    │   └── plugins
    ├── runnodes
    └── runnodes.bat
 There will be one folder generated for each node you build (more on later when we get into the detail of the
 ``deployNodes`` Gradle task) and a ``runnodes`` shell script (batch file on Widnows).
 Each node folder contains the Corda JAR, a folder for dependencies and a folder for plugins (or CorDapps). There is also
 a node.conf file. See :doc:`Corda configuration files <corda-configuration-file>`.
 **Building from IntelliJ**
 Open the Gradle window by selecting ``View > Tool windows > Gradle`` from the main menu. You will see the Gradle window
 open on the right hand side of the IDE. Expand `tasks` and then expand `other`. Double click on `deployNodes`. Gradle will
 start the build process and output progress to a console window in the IDE.
 Running the Sample CorDapp
 ==========================
 Running the Sample CorDapp from the command line
 ------------------------------------------------
 To run the sample CorDapp navigate to the ``build/nodes`` folder and execute the ``runnodes`` shell script with:
 Unix: ``./runnodes`` or ``sh runnodes``
 Windows: ``runnodes.bat``
 The ``runnodes`` scripts should create a terminal tab for each node. In each terminal tab, you'll see the Corda welcome
 message and some pertinent config information, see below:
 .. sourcecode:: none
     ______               __
    / ____/     _________/ /___ _
   / /     __  / ___/ __  / __ `/         Computer science and finance together.
  / /___  /_/ / /  / /_/ / /_/ /          You should see our crazy Christmas parties!
  \____/     /_/   \__,_/\__,_/
  --- DEVELOPER SNAPSHOT ------------------------------------------------------------
  Logs can be found in                    : /Users/rogerwillis/Documents/Corda/cordapp-template/build/nodes/nodea/logs
  Database connection url is              : jdbc:h2:tcp://10.18.0.196:50661/node
  Node listening on address               : localhost:10004
  Loaded plugins                          : com.example.plugin.ExamplePlugin
  Embedded web server is listening on     : http://10.18.0.196:10005/
  Node started up and registered in 39.0 sec
 You'll need to refer to the above later on for the JDBC connection string and port numbers.
 Depending on the speed of your machine, it usually takes around 30 seconds for the nodes to finish starting up. If you
 want to double check all the nodes are running you can query the 'status' end-point located at
 ``http://host:post/api/status``.
 When booted up, the node will generate a bunch of files and directories in addition to the ones covered above:
 .. sourcecode:: none
  .
  ├── artemis
  ├── attachments
  ├── cache
  ├── certificates
  ├── corda.jar
  ├── dependencies
  ├── identity-private-key
  ├── identity-public
  ├── logs
  ├── node.conf
  ├── persistence.mv.db
  └── plugins
 Notably:
 * **artemis** contains the internal files for Artemis MQ, our message broker.
 * **attachments** contains any persisted attachments.
 * **certificates** contains the certificate store.
 * **identity-private-key** is the node's private key.
 * **identity-public** is the node's public key.
 * **logs** contains the node's log files.
 * **persistence.mv.db** is the h2 database where transactions and other data is persisted.
 Additional files and folders are added as the node is running.
 Running CorDapps on separate machines
 -------------------------------------
 Corda nodes can be run on separate machines with little additional configuration to the above instructions.
 When you have successfully run the ``deployNodes`` gradle task, choose which nodes you would like to run on separate
 machines. Copy the folders for those nodes from ``build/nodes`` to the other machines. Make sure that you set the
 ``networkMapAddress`` property in ``node.conf`` to the correct hostname:port where the network map service node is
 hosted.
 The nodes can be run on each machine with ``java -jar corda.jar`` from the node's directory.
 Running the example CorDapp via IntelliJ
 ----------------------------------------
 To run the example CorDapp via IntelliJ you can use the ``Run Example CorDapp`` run configuration. Select it from the drop
 down menu at the top right-hand side of the IDE and press the green arrow to start the nodes. See image below:
 .. image:: resources/run-config-drop-down.png
  :width: 400
 The node driver defined in ``/src/main/kotlin/com/example/Main.kt`` allows you to specify how many nodes you would like
 to run and the various configuration settings for each node. With the example CorDapp, the Node driver starts four nodes
 and sets up an RPC user for all but the "Controller" node (which hosts the notary Service and network map service):
 .. sourcecode:: kotlin
  fun main(args: Array<String>) {
      // No permissions required as we are not invoking flows.
      val user = User("user1", "test", permissions = setOf())
      driver(dsl = {
          startNode("Controller", setOf(ServiceInfo(ValidatingNotaryService.type)))
          startNode("NodeA", rpcUsers = listOf(user))
          startNode("NodeB", rpcUsers = listOf(user))
          startNode("NodeC", rpcUsers = listOf(user))
          waitForAllNodesToFinish()
      }, isDebug = true)
  }
 To stop the nodes, press the red "stop" button at the top right-hand side of the IDE.
 The node driver can also be used to as a basis for `debugging your CorDapp`_
 Using the sample CorDapp
 ========================
 Background
 ----------
 The Example CorDapp implements a basic scenario where a buyer wishes to submit purchase orders to a seller. The scenario
 defines four nodes:
 * **Controller** which hosts the network map service and validating notary service.
 * **NodeA** who is the buyer.
 * **NodeB** who is the seller.
 * **NodeC** an unrelated third party.
 NodeA can generate purchase orders for lists and quantities of items and associated metadata such as delivery address
 and delivery date. The flows used to facilitate the agreement process always results in an agreement with the seller as
 long as the purchase order meets the contract constraints which are defined in ``PurchaseOrderContract.kt``.
 All agreed purchase orders between NodeA and NodeB become "shared facts" between NodeA and NodeB. But note that NodeC
 won't see any of these transactions or have copies of any of the resulting ``PurchaseOrderState`` objects. This is
 because data is only propagated on a need-to-know basis.
 Interfaces
 ----------
 The CorDapp defines a few HTTP API end-points and also serves some static web content. The end-points allow you to
 list purchase orders and add purchase orders.
 The nodes can be found using the following port numbers, defined in build.gradle and the respective node.conf file for
 each node found in `build/nodes/NodeX`` etc:
 * Controller: ``localhost:10003``
 * NodeA:      ``localhost:10005``
 * NodeB:      ``localhost:10007``
 * NodeC:      ``localhost:10009``
 Note that the ``deployNodes`` Gradle task is used to generate the ``node.conf`` files for each node.
 As the nodes start-up they should tell you which host and port the embedded web server is running on. The API endpoints
 served are as follows:
 * ``/api/example/me``
 * ``/api/example/peers``
 * ``/api/example/purchase-orders``
 * ``/api/example/{COUNTERPARTY}/create-purchase-order``
 The static web content is served from ``/web/example``.
 A purchase order can be created via accessing the ``api/example/create-purchase-order`` end-point directly or through the
 the web form hosted at ``/web/example``.
 .. warning:: **The content in ``web/example`` is only available for demonstration purposes and does not implement any
  anti-XSS, anti-XSRF or any other security techniques. Do not copy such code directly into products meant for production use.**
 **Submitting a purchase order via HTTP API:**
 To create a purchase order from NodeA to NodeB, use:
 .. sourcecode:: bash
  echo '{"orderNumber": "1","deliveryDate": "2018-09-15","deliveryAddress": {"city": "London","country": "UK"},"items" : [{"name": "widget","amount": "3"},{"name": "thing","amount": "4"}]}' | curl -T - -H 'Content-Type: application/json' http://localhost:10005/api/example/NodeB/create-purchase-order
 Note the port number ``10005`` (NodeA) and NodeB referenced in the API end-point path. This command instructs NodeA to
 create and send a purchase order to NodeB. Upon verification and completion of the process, both nodes (but not NodeC) will
 have a signed, notarised copy of the purchase order.
 **Submitting a purchase order via web/example:**
 Navigate to the "create purchase order" button at the top left of the page, enter in the purchase order details e.g.
 .. sourcecode:: none
  Counter-party: Select from list
  Order Number:  1
  Delivery Date: 2018-09-15
  City:          London
  Country Code:  UK
  Item name:     Wow such item
  Item amount:   5
 and click submit (note you can add additional item types and amounts). Upon pressing submit, the modal dialogue should close.
 To check what validation is performed over the purchase order data, have a look at the ``PurchaseOrderContract.Place`` class in
 ``PurchaseOrderContract.kt`` which defines the following contract constraints (among others not included here):
 .. sourcecode:: kotlin
  // Purchase order specific constraints.
  "We only deliver to the UK." by (out.po.deliveryAddress.country == "UK")
  "You must order at least one type of item." by (out.po.items.size > 0)
  "You cannot order zero or negative amounts of an item." by (out.po.items.map(Item::amount).all { it > 0 })
  "You can only order up to 10 items at a time." by (out.po.items.map(Item::amount).sum() <= 10)
  val time = tx.timestamp?.midpoint
  "The delivery date must be in the future." by (out.po.deliveryDate.toInstant() > time)
 **Once a purchase order has been submitted:**
 Inspect the terminal windows for the nodes. Assume all of the above contract constraints are met, you should see some
 activity in the terminal windows for NodeA and NodeB (note: the green ticks are only visible on unix/mac):
 *NodeA:*
 .. sourcecode:: none
  ✅  Constructing proposed purchase order.
  ✅  Sending purchase order to seller for review.
  ✅  Received partially signed transaction from seller.
  ✅  Verifying signatures and contract constraints.
  ✅  Signing transaction with our private key.
  ✅  Obtaining notary signature.
      ✅  Requesting signature by Notary service
      ✅  Validating response from Notary service
  ✅  Recording transaction in vault.
  ✅  Sending fully signed transaction to seller.
  ✅  Done
 *NodeB:*
 .. sourcecode:: none
  ✅  Receiving proposed purchase order from buyer.
  ✅  Generating transaction based on proposed purchase order.
  ✅  Signing proposed transaction with our private key.
  ✅  Sending partially signed transaction to buyer and wait for a response.
  ✅  Verifying signatures and contract constraints.
  ✅  Recording transaction in vault.
  ✅  Done
 *NodeC:*
 .. sourcecode:: none
  You shouldn't see any activity.
 Next you can view the newly created purchase order by accessing the vault of NodeA or NodeB:
 *Via the HTTP API:*
 For NodeA. navigate to http://localhost:10005/api/example/purchase-orders. For NodeB,
 navigate to http://localhost:10007/api/example/purchase-orders.
 *Via web/example:*
 Navigate to http://localhost:10005/web/example the refresh button in the top left-hand side of the page. You should
 see the newly created agreement on the page.
 **Accessing the h2 database via h2 web console:**
 You can connect to the h2 database to see the current state of the ledger, among other data such as the current state of
 the network map cache. Firstly, navigate to the folder where you downloaded the h2 web console as part of the pre-requisites
 section, above. Change directories to the bin folder:
 ``cd h2/bin``
 Where there are a bunch of shell scripts and batch files. Run the web console:
 Unix:
 ``sh h2.sh``
 Windows:
 ``h2.bat``
 The h2 web console should start up in a web browser tab. To connect we first need to obtain a JDBC connection string. Each
 node outputs its connection string in the terminal window as it starts up. In a terminal window where a node is running,
 look for the following string:
 ``Database connection url is              : jdbc:h2:tcp://10.18.0.150:56736/node``
 you can use the string on the right to connect to the h2 database: just paste it in to the JDBC URL field and click Connect.
 You will be presented with a web application that enumerates all the available tables and provides an interface for you to
 query them using SQL.
 **Using the Example RPC client:**
 The ``/src/main/kotlin/com/example/client/ExampleClientRPC.kt`` file is a simple utility which uses the client RPC library
 to connect to a node and log the 'placed' purchase orders. It will log any existing purchase orders and listen for any future
 purchase orders. If you haven't placed any purchase orders when you connect to to one of the Nodes via RPC then the client will log
 and future purchase orders which are agreed.
 To build the client use the following gradle task:
 ``./gradlew runExampleClientRPC``
 *To run the client, via IntelliJ:*
 Select the 'Run Example RPC Client' run configuration which, by default, connects to NodeA (Artemis port 10004). Click the
 Green Arrow to run the client. You can edit the run configuration to connect on a different port.
 *Via command line:*
 Run the following gradle task:
 ``./gradlew runExampleClientRPC localhost:10004``
 To close the application use ``ctrl+C``. For more information on the client RPC interface and how to build an RPC client
 application see:
 * :doc:`Client RPC documentation <clientrpc>`
 * :doc:`Client RPC tutorial <tutorial-clientrpc-api>`
 CorDapp-template Project Structure
 ----------------------------------
 The CorDapp template has the following directory structure:
 .. sourcecode:: none
    . cordapp-template
    ├── README.md
    ├── LICENSE
    ├── build.gradle
    ├── config
    │   ├── ...
    ├── gradle
    │   └── ...
    ├── gradle.properties
    ├── gradlew
    ├── gradlew.bat
    ├── lib
    │   ├── ...
    ├── settings.gradle
    └── src
        ├── main
        │   ├── java
        │   ├── kotlin
        │   │   └── com
        │   │       └── example
        │   │           ├── Main.kt
        │   │           ├── api
        │   │           │   └── ExampleApi.kt
        │   │           ├── client
        │   │           │   └── ExampleClientRPC.kt
        │   │           ├── contract
        │   │           │   ├── PurchaseOrderContract.kt
        │   │           │   └── PurchaseOrderState.kt
        │   │           ├── model
        │   │           │   └── PurchaseOrder.kt
        │   │           ├── plugin
        │   │           │   └── ExamplePlugin.kt
        │   │           └── flow
        │   │               └── ExampleFlow.kt
        │   │           └── service
        │   │               └── ExampleService.kt
        │   ├── python
        │   └── resources
        │       ├── META-INF
        │       │   └── services
        │       │       └── net.corda.core.node.CordaPluginRegistry
        │       ├── certificates
        │       │   ├── readme.txt
        │       │   ├── sslkeystore.jks
        │       │   └── truststore.jks
        │       └── exampleWeb
        │           ├── index.html
        │           └── js
        │               └── example.js
        └── test
            ├── java
            ├── kotlin
            │   └── com
            │       └── example
            │           └── ExampleTest.kt
            └── resources
 In the file structure above, the most important files and directories to note are:
 * The **root directory** contains some gradle files, a README and a LICENSE.
 * **config** contains log4j configs.
 * **gradle** contains the gradle wrapper, which allows the use of Gradle without installing it yourself and worrying
  about which version is required.
 * **lib** contains the Quasar.jar which is required for runtime instrumentation of classes by Quasar.
 * **src/main/kotlin** contains the source code for the example CorDapp.
 * **src/main/python** contains a python script which accesses nodes via RPC.
 * **src/main/resources** contains the certificate store, some static web content to be served by the nodes and the
  PluginServiceRegistry file.
 * **src/test/kotlin** contains unit tests for protocols, contracts, etc.
 Some elements are covered in more detail below.
 The build.gradle File
 ---------------------
 It is usually necessary to make a couple of changes to the ``build.gradle`` file. Here will cover the most pertinent bits.
 **The buildscript**
 The buildscript is always located at the top of the file. It determines which plugins, task classes, and other classes
 are available for use in the rest of the build script. It also specifies version numbers for dependencies, among other
 things.
 If you are working from a Corda SNAPSHOT release which you have publish to Maven local then ensure that
 ``corda_version`` is the same as the version of the Corda core modules you published to Maven local. If not then change the
 ``kotlin_version`` property. Also, if you are working from a previous milestone release, then be sure to ``git checkout``
 the correct version of the CorDapp template from the ``cordapp-template`` repo.
 .. sourcecode:: groovy
  buildscript {
      ext.kotlin_version = '1.0.4'
      ext.corda_version = '0.5-SNAPSHOT' // Ensure this version is the same as the corda core modules you are using.
      ext.quasar_version = '0.7.6'
      ext.jersey_version = '2.23.1'
      repositories {
        ...
      }
      dependencies {
        ...
      }
  }
 **Project dependencies**
 If you have any additional external dependencies for your CorDapp then add them below the comment at the end of this
 code snippet.package. Use the standard format:
 ``compile "{groupId}:{artifactId}:{versionNumber}"``
 .. sourcecode:: groovy
  dependencies {
      compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
      testCompile group: 'junit', name: 'junit', version: '4.11'
      // Corda integration dependencies
      compile "net.corda:client:$corda_version"
      compile "net.corda:core:$corda_version"
      compile "net.corda:contracts:$corda_version"
      compile "net.corda:node:$corda_version"
      compile "net.corda:corda:$corda_version"
      compile "net.corda:test-utils:$corda_version"
      ...
      // Cordapp dependencies
      // Specify your cordapp's dependencies below, including dependent cordapps
  }
 For further information about managing dependencies with `look at the Gradle docs <https://docs.gradle.org/current/userguide/dependency_management.html>`_.
 **CordFormation**
 This is the local node deployment system for CorDapps, the nodes generated are intended to be used for experimenting,
 debugging, and testing node configurations but not intended for production or testnet deployment.
 In the CorDapp build.gradle file you'll find a ``deployNodes`` task, this is where you configure the nodes you would
 like to deploy for testing. See further details below:
 .. sourcecode:: groovy
  task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['build']) {
      directory "./build/nodes"                            // The output directory.
      networkMap "Controller"                              // The artemis address of the node to be used as the network map.
      node {
          name "Controller"                                // Artemis name of node to be deployed.
          dirName "controller"                             // Directory to which the node will
          nearestCity "London"                             // For use with the network visualiser.
          advertisedServices = ["corda.notary.validating"] // A list of services you wish the node to offer.
          artemisPort 10002
          webPort 10003                                    // Usually 1 higher than the Artemis port.
          cordapps = []                                    // Add package names of CordaApps.
      }
      node {                                               // Create an additional node.
          name "NodeA"
          dirName "nodea"
          nearestCity "London"
          advertisedServices = []
          artemisPort 10004
          webPort 10005
          cordapps = []
      }
      ...
  }
 You can add any number of nodes, with any number of services / CorDapps by editing the templates in ``deployNodes``. The
 only requirement is that you must specify a node to run as the network map service and one as the notary service.
 .. note:: CorDapps in the current cordapp-template project are automatically registered with all nodes defined in
  ``deployNodes``, although we expect this to change in the near future.
 .. warning:: Make sure that there are no port clashes!
 When you are finished editing your *CordFormation* the changes will be reflected the next time you run ``./gradlew deployNodes``.
 Service Provider Configuration File
 -----------------------------------
 If you are building a CorDapp from scratch or adding a new CorDapp to the CorDapp-template project then you must provide
 a reference to your sub-class of ``CordaPluginRegistry`` in the provider-configuration file in located in the the
 ``resources/META-INF/services`` directory.
 Re-Deploying Your Nodes Locally
 -------------------------------
 If you need to create any additional nodes you can do it via the ``build.gradle`` file as discussed above in
 ``the build.gradle file`` and in more detail in the "cordFormation" section.
 You may also wish to edit the ``/build/nodes/<node name>/node.conf`` files for your nodes. For more information on
 doing this, see the :doc:`Corda configuration file <corda-configuration-file>` page.
 Once you have made some changes to your CorDapp you can redeploy it with the following command:
 Unix/Mac OSX: ``./gradlew deployNodes``
 Windows: ``gradlew.bat deployNodes``
 Debugging your CorDapp
 ----------------------
 Debugging is done via IntelliJ and can be done using the following steps.
 1. Set your breakpoints.
 2. Edit the node driver code in ``Main.kt`` to reflect how many nodes you wish to start along with any other
   configuration options. For example, the below starts 4 nodes, with one being the network map service / notary and
   sets up RPC credentials for 3 of the nodes.
 .. sourcecode:: kotlin
    fun main(args: Array<String>) {
        // No permissions required as we are not invoking flows.
        val user = User("user1", "test", permissions = setOf())
        driver(dsl = {
            startNode("Controller", setOf(ServiceInfo(ValidatingNotaryService.type)))
            startNode("NodeA", rpcUsers = listOf(user))
            startNode("NodeB", rpcUsers = listOf(user))
            startNode("NodeC", rpcUsers = listOf(user))
            waitForAllNodesToFinish()
        }, isDebug = true)
    }
 3. Select and run the “Run Example CorDapp” run configuration in IntelliJ.
 4. IntelliJ will build and run the CorDapp. Observe the console output for the remote debug ports. The “Controller”
   node will generally be on port 5005, with NodeA on port 5006 an so-on.
 .. sourcecode:: none
    Listening for transport dt_socket at address: 5008
    Listening for transport dt_socket at address: 5007
    Listening for transport dt_socket at address: 5006
 5. Edit the “Debug CorDapp” run configuration with the port of the node you wish to connect to.
 6. Run the “Debug CorDapp” run configuration.
--- a/docs/build/html/_sources/tutorial-integration-testing.txt
+++ b/docs/build/html/_sources/tutorial-integration-testing.txt
@ -0,0 +1,117 @@
 Integration Test Tutorial
 =========================
 Integration testing involves bringing up nodes locally and testing
 invariants about them by starting flows and inspecting their state.
 In this tutorial we will bring up three nodes Alice, Bob and a
 Notary. Alice will issue Cash to Bob, then Bob will send this Cash
 back to Alice. We will see how to test some simple deterministic and
 nondeterministic invariants in the meantime.
 (Note that this example where Alice is self-issuing Cash is purely for
 demonstration purposes, in reality Cash would be issued by a bank and
 subsequently passed around.)
 In order to spawn nodes we will use the Driver DSL. This DSL allows
 one to start up node processes from code. It manages a network map
 service and safe shutting down of nodes in the background.
 .. literalinclude:: example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
    :language: kotlin
    :start-after: START 1
    :end-before: END 1
 The above code creates a ``User`` permissioned to start the
 ``CashFlow`` protocol. It then starts up Alice and Bob with this user,
 allowing us to later connect to the nodes.
 Then the notary is started up. Note that we need to add
 ``ValidatingNotaryService`` as an advertised service in order for this
 node to serve notary functionality. This is also where flows added in
 plugins should be specified. Note also that we won't connect to the
 notary directly, so there's no need to pass in the test ``User``.
 The ``startNode`` function returns a future that completes once the
 node is fully started. This allows starting of the nodes to be
 parallel. We wait on these futures as we need the information
 returned; their respective ``NodeInfo`` s.
 .. literalinclude:: example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
    :language: kotlin
    :start-after: START 2
    :end-before: END 2
 Next we connect to Alice and Bob respectively from the test process
 using the test user we created. Then we establish RPC links that allow
 us to start flows and query state.
 Note that Driver nodes start up with test server certificiates, so
 it's enough to pass in ``configureTestSSL()`` for the clients.
 .. literalinclude:: example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
    :language: kotlin
    :start-after: START 3
    :end-before: END 3
 We will be interested in changes to Alice's and Bob's vault, so we
 query a stream of vault updates from each.
 Now that we're all set up we can finally get some Cash action going!
 .. literalinclude:: example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
    :language: kotlin
    :start-after: START 4
    :end-before: END 4
 The first loop creates 10 threads, each starting a ``CashFlow`` flow
 on the Alice node. We specify that we want to issue ``i`` dollars to
 Bob, using the Notary as the notary responsible for notarising the
 created states. Note that no notarisation will occur yet as we're not
 spending any states, only entering new ones to the ledger.
 We started the flows from different threads for the sake of the
 tutorial, to demonstrate how to test non-determinism, which is what
 the ``expectEvents`` block does.
 The Expect DSL allows ordering constraints to be checked on a stream
 of events. The above code specifies that we are expecting 10 updates
 to be emitted on the ``bobVaultUpdates`` stream in unspecified order
 (this is what the ``parallel`` construct does). We specify a
 (otherwise optional) ``match`` predicate to identify specific updates
 we are interested in, which we then print.
 If we run the code written so far we should see 4 nodes starting up
 (Alice,Bob,Notary + implicit Network Map service), then 10 logs of Bob
 receiving 1,2,...10 dollars from Alice in some unspecified order.
 Next we want Bob to send this Cash back to Alice.
 .. literalinclude:: example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
    :language: kotlin
    :start-after: START 5
    :end-before: END 5
 This time we'll do it sequentially. We make Bob pay 1,2,..10 dollars
 to Alice in order. We make sure that a the ``CashFlow`` has finished
 by waiting on ``startFlow`` 's ``returnValue``.
 Then we use the Expect DSL again, this time using ``sequence`` to test
 for the updates arriving in the order we expect them to.
 Note that ``parallel`` and ``sequence`` may be nested into each other
 arbitrarily to test more complex scenarios.
 That's it! We saw how to start up several corda nodes locally, how to
 connect to them, and how to test some simple invariants about
 ``CashFlow``.
 To run the complete test you can open
 ``example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt``
 from IntelliJ and run the test, or alternatively use gradle:
 .. sourcecode:: bash
     # Run example-code integration tests
     ./gradlew docs/source/example-code:integrationTest -i
--- a/docs/build/html/_static/css/custom.css
+++ b/docs/build/html/_static/css/custom.css
@ -1,4 +1,5 @@
@import "theme.css";
 /* Highlights */
 .highlight .k,
@ -6,7 +7,9 @@
    color: #263673;
 }
- /* Text */
+
 /* Text */
 body,
 h1,
 h2,
@ -16,81 +19,82 @@ h4,
 h5,
 h6,
 legend,
-input{
+input {
-      color:#010101;
+    color: #010101;
-      letter-spacing:0.3px
+    letter-spacing: 0.3px
 }
 p {
    font-size: 100%; /* Get rid of RTD rule that assumes nobody changes their browser font size */
 }
- /* Links */
+
-a{
+/* Links */
 a {
    color: #263673
 }
-a:hover{
+
 a:hover {
    color: #005CAB
 }
-a:visited{
+
-       color:#ADAFB3
+a:visited {
    color: #ADAFB3
 }
 /* Side navigation bar */
-.wy-side-nav-search{
+/* Side navigation bar */
 	background-color:#010101;
 .wy-side-nav-search {
    background-color: #252627;
 }
-.wy-side-nav-search a.icon-home{
+.wy-side-nav-search a.icon-home {
-        color:transparent;
+    color: transparent;
-        background-image:url('../images/fg002_corda_w3.png');
+    background-image: url('../images/fg002_corda_w3.png');
-	background-repeat:no-repeat;
+    background-repeat: no-repeat;
    background-size: Auto 20px;
-	background-position:center top;
+    background-position: center top;
-	background-origin:content box;
+    background-origin: content box;
-	height:20px;
+    height: 20px;
-	width:100%
+    width: 100%
 }
-.wy-side-nav-search input[type=text]{
+.wy-side-nav-search input[type=text] {
-	border-radius:5px
+    border-radius: 5px
 }
-.wy-menu-vertical a:hover{
+.wy-menu-vertical a:hover {
    background-color: #ADAFB3;
-        color:#FFF
+    color: #FFF
 }
-.wy-nav-content{
+.wy-nav-content {
-	background-color:#fff
+    background-color: #fff max-width: 1000px;
        max-width: 1000px;
 }
-.wy-nav-side{
+.wy-nav-side {
-	background:#010101
+    background-color: #252627;
 }
 /* Navigation headers */
 .rst-content tt.literal, .rst-content tt.literal, .rst-content code.literal
 {
 	color:#EC1D24;
 	text-transform:none;
 }
-.wy-menu-vertical header, .wy-menu-vertical p.caption
+/* Navigation headers */
-{
+
-	font-size:1.1em;
+.rst-content tt.literal,
-	color:#EC1D24;
+.rst-content tt.literal,
-	text-transform:none;
+.rst-content code.literal {
-	background-color: #3C3C3E;
+    color: #EC1D24;
-	padding: 0 0.5em;
+    text-transform: none;
 	margin-top: 0.5em;
 }
- /* Code snippets */
+.wy-menu-vertical header,
 .wy-menu-vertical p.caption {
    color: #EC1D24;
 }
 /* Code snippets */
 .codesnippet-widgets {
    min-width: 100%;
@ -116,6 +120,7 @@ a:visited{
 /* Notification boxes */
 .wy-alert.wy-alert-warning .wy-alert-title,
 .rst-content .wy-alert-warning.note .wy-alert-title,
 .rst-content .attention .wy-alert-title,
@ -132,15 +137,15 @@ a:visited{
 .rst-content .wy-alert.wy-alert-warning .admonition-title,
 .rst-content .wy-alert-warning.note .admonition-title,
 .rst-content .attention .admonition-title,
-.rst-content .caution .admonition-title, .rst-content
+.rst-content .caution .admonition-title,
-.wy-alert-warning.danger .admonition-title,
+.rst-content .wy-alert-warning.danger .admonition-title,
 .rst-content .wy-alert-warning.error .admonition-title,
 .rst-content .wy-alert-warning.hint .admonition-title,
 .rst-content .wy-alert-warning.important .admonition-title,
 .rst-content .wy-alert-warning.tip .admonition-title,
 .rst-content .warning .admonition-title,
 .rst-content .wy-alert-warning.seealso .admonition-title,
-.rst-content .admonition-todo .admonition-title{
+.rst-content .admonition-todo .admonition-title {
    background-color: #263673
 }
@ -155,7 +160,22 @@ a:visited{
 .rst-content .tip,
 .rst-content .warning,
 .rst-content .seealso,
-.rst-content .admonition-todo{
+.rst-content .admonition-todo {
-        background-color:#d9e5ef
+    background-color: #d9e5ef
 }
 /* Mobile view */
 .wy-nav-top {
    background-color: #252627;
 }
 .wy-nav-top a {
    color: transparent;
    background-image: url('../images/fg002_corda_w3.png');
    background-repeat: no-repeat;
    background-size: Auto 19px;
    background-position: center top;
    background-origin: content box;
 }
--- a/docs/build/html/api/net.corda.flows/-abstract-state-replacement-flow/-acceptor/index.html
+++ b/docs/build/html/api/net.corda.flows/-abstract-state-replacement-flow/-acceptor/index.html
@ -143,8 +143,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../../net.corda.core.flows/-flow-logic/send-and-receive.html">sendAndReceive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.flows/-abstract-state-replacement-flow/-instigator/index.html
+++ b/docs/build/html/api/net.corda.flows/-abstract-state-replacement-flow/-instigator/index.html
@ -133,8 +133,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../../net.corda.core.flows/-flow-logic/receive.html">receive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -146,8 +146,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../../net.corda.core.flows/-flow-logic/send-and-receive.html">sendAndReceive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.flows/-broadcast-transaction-flow/index.html
+++ b/docs/build/html/api/net.corda.flows/-broadcast-transaction-flow/index.html
@ -127,8 +127,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../net.corda.core.flows/-flow-logic/receive.html">receive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.flows/-fetch-data-flow/index.html
+++ b/docs/build/html/api/net.corda.flows/-fetch-data-flow/index.html
@ -179,8 +179,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../net.corda.core.flows/-flow-logic/receive.html">receive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -192,8 +192,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../net.corda.core.flows/-flow-logic/send-and-receive.html">sendAndReceive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any, java.lang.Class((net.corda.core.flows.FlowLogic.sendAndReceive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sendAndReceive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$sendAndReceive(net.corda.core.crypto.Party, kotlin.Any)/payload">payload</span><span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.flows/-finality-flow/index.html
+++ b/docs/build/html/api/net.corda.flows/-finality-flow/index.html
@ -131,8 +131,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../net.corda.core.flows/-flow-logic/receive.html">receive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.flows/-notary-flow/-service/index.html
+++ b/docs/build/html/api/net.corda.flows/-notary-flow/-service/index.html
@ -130,8 +130,8 @@ will do as long as the other side registers with it.</p>
 <td>
 <a href="../../../net.corda.core.flows/-flow-logic/receive.html">receive</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party, java.lang.Class((net.corda.core.flows.FlowLogic.receive.T)))/receiveType">receiveType</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Class.html"><span class="identifier">Class</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">receive</span><span class="symbol">(</span><span class="identifier" id="net.corda.core.flows.FlowLogic$receive(net.corda.core.crypto.Party)/otherParty">otherParty</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.utilities/-untrustworthy-data/index.html"><span class="identifier">UntrustworthyData</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/building-the-docs.html
+++ b/docs/build/html/building-the-docs.html
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,40 +116,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<ul>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
-<li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Flow state machines</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -260,7 +277,7 @@ following to see a list of all available formats:</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/clauses.html
+++ b/docs/build/html/clauses.html
@ -0,0 +1,521 @@
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Clauses key concepts &mdash; R3 Corda latest documentation</title>
    <link rel="stylesheet" href="_static/css/custom.css" type="text/css" />
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="CorDapps Background" href="creating-a-cordapp.html"/>
        <link rel="prev" title="Consensus model" href="consensus.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
 </head>
 <body class="wy-body-for-nav" role="document">
  <div class="wy-grid-for-nav">
    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
      <div class="wy-side-scroll">
        <div class="wy-side-nav-search">
            <a href="index.html" class="icon icon-home"> R3 Corda
          </a>
              <div class="version">
                latest
              </div>
 <div role="search">
  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
    <input type="text" name="q" placeholder="Search docs" />
    <input type="hidden" name="check_keywords" value="yes" />
    <input type="hidden" name="area" value="default" />
  </form>
 </div>
 <br>
 <a href="api/index.html">API reference</a>
        </div>
        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
                <p class="caption"><span class="caption-text">Getting started</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Clauses key concepts</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#basic-clause-structure">Basic clause structure</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#composition-clauses">Composition clauses</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#allcomposition">AllComposition</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#anycomposition">AnyComposition</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#firstcomposition">FirstComposition</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#other-types-of-clauses">Other types of clauses</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#groupclauseverifier">GroupClauseVerifier</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#abstractconserveamount">AbstractConserveAmount</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#abstractissue">AbstractIssue</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#nozerosizedoutputs">NoZeroSizedOutputs</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#filteron">FilterOn</a></li>
 </ul>
 </li>
 </ul>
 </li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="clientrpc.html">Client RPC</a></li>
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
 <li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-notes.html">Release notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="codestyle.html">Code style guide</a></li>
 <li class="toctree-l1"><a class="reference internal" href="building-the-docs.html">Building the documentation</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Glossary</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="glossary.html">Glossary</a></li>
 </ul>
        </div>
      </div>
    </nav>
    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
        <a href="index.html">R3 Corda</a>
      </nav>
      <div class="wy-nav-content">
        <div class="rst-content">
 <div role="navigation" aria-label="breadcrumbs navigation">
  <ul class="wy-breadcrumbs">
    <li><a href="index.html">Docs</a> &raquo;</li>
    <li>Clauses key concepts</li>
      <li class="wy-breadcrumbs-aside">
            <a href="_sources/clauses.txt" rel="nofollow"> View page source</a>
      </li>
  </ul>
  <hr/>
 </div>
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
           <div itemprop="articleBody">
  <div class="section" id="clauses-key-concepts">
 <h1>Clauses key concepts<a class="headerlink" href="#clauses-key-concepts" title="Permalink to this headline">¶</a></h1>
 <div class="section" id="basic-clause-structure">
 <h2>Basic clause structure<a class="headerlink" href="#basic-clause-structure" title="Permalink to this headline">¶</a></h2>
 <p>A clause is a small building block for assembling contract verification logic, reusable and ready to test in separation.
 To see clauses in action go to: <a class="reference internal" href="tutorial-contract-clauses.html"><span class="doc">Writing a contract using clauses</span></a>.
 Let&#8217;s take a look at a simplified structure of the <code class="docutils literal"><span class="pre">Clause</span></code> class:</p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">abstract</span> <span class="k">class</span> <span class="nc">Clause</span><span class="p">&lt;</span><span class="k">in</span> <span class="n">S</span> <span class="p">:</span> <span class="n">ContractState</span><span class="p">,</span> <span class="n">C</span> <span class="p">:</span> <span class="n">CommandData</span><span class="p">,</span> <span class="k">in</span> <span class="n">K</span> <span class="p">:</span> <span class="n">Any</span><span class="p">&gt;</span> <span class="p">{</span>
    <span class="cm">/** Determine whether this clause runs or not */</span>
    <span class="k">open</span> <span class="k">val</span> <span class="py">requiredCommands</span><span class="p">:</span> <span class="n">Set</span><span class="p">&lt;</span><span class="n">Class</span><span class="p">&lt;</span><span class="k">out</span> <span class="n">CommandData</span><span class="p">&gt;&gt;</span> <span class="p">=</span> <span class="n">emptySet</span><span class="p">()</span>
    <span class="n">@Throws</span><span class="p">(</span><span class="n">IllegalStateException</span><span class="o">::</span><span class="k">class</span><span class="p">)</span>
    <span class="k">abstract</span> <span class="k">fun</span> <span class="nf">verify</span><span class="p">(</span><span class="n">tx</span><span class="p">:</span> <span class="n">TransactionForContract</span><span class="p">,</span>
                <span class="n">inputs</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">S</span><span class="p">&gt;,</span>
                <span class="n">outputs</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">S</span><span class="p">&gt;,</span>
                <span class="n">commands</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">AuthenticatedObject</span><span class="p">&lt;</span><span class="n">C</span><span class="p">&gt;&gt;,</span>
                <span class="n">groupingKey</span><span class="p">:</span> <span class="n">K</span><span class="p">?):</span> <span class="n">Set</span><span class="p">&lt;</span><span class="n">C</span><span class="p">&gt;</span>
    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 </div>
 </div>
 <p>Basic clause structure contains two important components: <code class="docutils literal"><span class="pre">requiredCommands</span></code> and <code class="docutils literal"><span class="pre">verify</span></code> function.
 A clause is triggered when all <code class="docutils literal"><span class="pre">requiredCommands</span></code> are present in transaction&#8217;s command set (opposite inclusion doesn&#8217;t have to hold).
 Then the <code class="docutils literal"><span class="pre">verify</span></code> function is run, which checks if transaction meets conditions specified by this clause. Verification
 is no different than normal contract verification but using clauses it&#8217;s split into smaller generic code blocks with single verify method.</p>
 <p>When writing a contract you need to override the contract&#8217;s <code class="docutils literal"><span class="pre">verify</span></code> function which should call <code class="docutils literal"><span class="pre">verifyClause</span></code>. See: <a class="reference internal" href="tutorial-contract-clauses.html#verify-ref"><span class="std std-ref">Commercial paper class</span></a>.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last">A clause <code class="docutils literal"><span class="pre">verify</span></code> function returns the set of processed commands, at the end of <code class="docutils literal"><span class="pre">verifyClause</span></code> execution
 there is a check if all of transaction&#8217;s commands were matched. If not then an exception is raised. This is done to
 enforce that spurious commands cannot be included in a transaction, ensuring that the transaction is as clear as
 possible. As an example imagine a transaction with two commands: <code class="docutils literal"><span class="pre">Move</span></code> and <code class="docutils literal"><span class="pre">Issue</span></code> included, with verification written
 using <code class="docutils literal"><span class="pre">FirstComposition</span></code> on clauses that require single command set. Thus only one of transaction&#8217;s commands will match
 leaving the second unprocessed. It should raise an error - we want to ensure that commands set is minimal to simplify
 analysis of intent of a transaction.</p>
 </div>
 <p>An example <code class="docutils literal"><span class="pre">verify</span></code> from <code class="docutils literal"><span class="pre">Obligation</span></code> contract:</p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">override</span> <span class="k">fun</span> <span class="nf">verify</span><span class="p">(</span><span class="n">tx</span><span class="p">:</span> <span class="n">TransactionForContract</span><span class="p">)</span> <span class="p">=</span> <span class="n">verifyClause</span><span class="p">&lt;</span><span class="n">Commands</span><span class="p">&gt;(</span><span class="n">tx</span><span class="p">,</span> <span class="n">FirstComposition</span><span class="p">&lt;</span><span class="n">ContractState</span><span class="p">,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Unit</span><span class="p">&gt;(</span>
    <span class="n">Clauses</span><span class="p">.</span><span class="n">Net</span><span class="p">&lt;</span><span class="n">Commands</span><span class="p">,</span> <span class="n">P</span><span class="p">&gt;(),</span>
    <span class="n">Clauses</span><span class="p">.</span><span class="n">Group</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;()</span>
 <span class="p">),</span> <span class="n">tx</span><span class="p">.</span><span class="n">commands</span><span class="p">.</span><span class="n">select</span><span class="p">&lt;</span><span class="n">Obligation</span><span class="p">.</span><span class="n">Commands</span><span class="p">&gt;())</span>
 </pre></div>
 </div>
 </div>
 <p>It takes transaction to be verified, and passes it along with a top-level clause and commands to the <code class="docutils literal"><span class="pre">verifyClause</span></code>
 function. As you can see above we have used <code class="docutils literal"><span class="pre">FirstComposition</span></code> which is a special type of clause, which extends the
 <code class="docutils literal"><span class="pre">CompositeClause</span></code> abstract class (in that particular case, it ensures that either <code class="docutils literal"><span class="pre">Net</span></code> or <code class="docutils literal"><span class="pre">Group</span></code> will run - for explanation see <a class="reference internal" href="#firstcomposition">FirstComposition</a>).
 It&#8217;s a type of clause that adds support for encapsulating multiple clauses and defines common behaviour for that composition.
 There is also a <code class="docutils literal"><span class="pre">GroupClauseVerifier</span></code> special clause, which specifies how to group transaction input/output states
 together and passes them to adequate clause for further processing.</p>
 </div>
 <div class="section" id="composition-clauses">
 <h2>Composition clauses<a class="headerlink" href="#composition-clauses" title="Permalink to this headline">¶</a></h2>
 <p>One of the most important concepts of clauses - composition clauses which extend <code class="docutils literal"><span class="pre">CompositeClause</span></code> abstract class,
 providing a range of ways of assembling clauses together. They define a logic of verification execution specifying which clauses
 will be run.</p>
 <div class="section" id="allcomposition">
 <h3>AllComposition<a class="headerlink" href="#allcomposition" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Composes a number of clauses, such that all of the clauses must run for verification to pass.</p>
 <img alt="_images/allCompositionChart.png" src="_images/allCompositionChart.png" />
 <p>Short description:</p>
 <ul class="simple">
 <li><code class="docutils literal"><span class="pre">AllComposition</span></code> holds clauses <em>Cl1,..,Cl5</em>.</li>
 <li>Check if all clauses that compose <code class="docutils literal"><span class="pre">AllComposition</span></code> have associated commands in a command set - if not, verification fails.</li>
 <li>After successful check runs verification logic specific for every clause <em>Cl1,..,Cl5</em> from that composition.</li>
 </ul>
 <p><strong>Usage</strong></p>
 <p>See code in <a class="reference internal" href="#groupclauseverifier">GroupClauseVerifier</a>.</p>
 </div>
 <div class="section" id="anycomposition">
 <h3>AnyComposition<a class="headerlink" href="#anycomposition" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Composes a number of clauses, such that 0 or more of the clauses can be run.</p>
 <img alt="_images/anyCompositionChart.png" src="_images/anyCompositionChart.png" />
 <p>Short description:</p>
 <ul class="simple">
 <li>Checks if zero or more clauses that compose AnyComposition have associated commands in a command set.</li>
 <li>After success runs verification logic specific for every <em>matched</em> (in this case <em>Cl2, Cl4, Cl5</em>) clause from composition.</li>
 </ul>
 <p><strong>Usage</strong></p>
 <p>Example from <code class="docutils literal"><span class="pre">CommercialPaper.kt</span></code>:</p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">Group</span> <span class="p">:</span> <span class="n">GroupClauseVerifier</span><span class="p">&lt;</span><span class="n">State</span><span class="p">,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&gt;&gt;(</span>
    <span class="n">AnyComposition</span><span class="p">(</span>
        <span class="n">Redeem</span><span class="p">(),</span>
        <span class="n">Move</span><span class="p">(),</span>
        <span class="n">Issue</span><span class="p">()))</span> <span class="p">{</span>
    <span class="k">override</span> <span class="k">fun</span> <span class="nf">groupStates</span><span class="p">(</span><span class="n">tx</span><span class="p">:</span> <span class="n">TransactionForContract</span><span class="p">):</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">TransactionForContract</span><span class="p">.</span><span class="n">InOutGroup</span><span class="p">&lt;</span><span class="n">State</span><span class="p">,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&gt;&gt;&gt;</span>
            <span class="p">=</span> <span class="n">tx</span><span class="p">.</span><span class="n">groupStates</span><span class="p">&lt;</span><span class="n">State</span><span class="p">,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&gt;&gt;</span> <span class="p">{</span> <span class="n">it</span><span class="p">.</span><span class="n">token</span> <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
 </div>
 </div>
 </div>
 <div class="section" id="firstcomposition">
 <h3>FirstComposition<a class="headerlink" href="#firstcomposition" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Composes a number of clauses, such that the first match is run, and it errors if none is run.</p>
 <img alt="_images/firstCompositionChart.png" src="_images/firstCompositionChart.png" />
 <p>Short description:</p>
 <ul class="simple">
 <li>Takes first clause that matches and if none found throws an exception.</li>
 <li>If successful runs verification on the clause that matched (in this case <em>Cl4</em>).</li>
 </ul>
 <p><strong>Usage</strong></p>
 <p>See code in <a class="reference internal" href="#groupclauseverifier">GroupClauseVerifier</a>.</p>
 </div>
 </div>
 <div class="section" id="other-types-of-clauses">
 <h2>Other types of clauses<a class="headerlink" href="#other-types-of-clauses" title="Permalink to this headline">¶</a></h2>
 <p>There are certain types of clauses that are specialized in particular types of contracts (like <code class="docutils literal"><span class="pre">AbstractIssue</span></code>) or generally
 should be used as helpers in building parts of logic (the most important one is <code class="docutils literal"><span class="pre">GroupClauseVerifier</span></code>).</p>
 <div class="section" id="groupclauseverifier">
 <h3>GroupClauseVerifier<a class="headerlink" href="#groupclauseverifier" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Groups input and output states according to <code class="docutils literal"><span class="pre">groupStates</span></code> function. Runs the top-level clause verification on each
 group in turn.</p>
 <img alt="_images/groupClauseVerifyChart.png" src="_images/groupClauseVerifyChart.png" />
 <p>Short description:</p>
 <p><code class="docutils literal"><span class="pre">GroupClauseVerifier</span></code> wraps clause <em>Cl1</em>. After grouping relevant states together with <code class="docutils literal"><span class="pre">groupStates</span></code> into three groups
 <em>Gr1, Gr2, Gr3</em> runs <em>Cl1.verify(Gr1), Cl1.verify(Gr2), Cl1.verify(Gr3)</em>.</p>
 <p>For more detailed example head to <a class="reference internal" href="tutorial-contract.html#state-ref"><span class="std std-ref">Using state groups</span></a>.</p>
 <p><strong>Usage</strong></p>
 <p>You need to extend <code class="docutils literal"><span class="pre">GroupClauseVerifier</span></code> clause and define <code class="docutils literal"><span class="pre">groupStates</span></code> function which takes transaction and returns
 grouped input and output states with a grouping key used for each group. Example from <code class="docutils literal"><span class="pre">Obligation.kt</span></code> contract:</p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">Group</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;</span> <span class="p">:</span> <span class="n">GroupClauseVerifier</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;&gt;(</span>
    <span class="n">AllComposition</span><span class="p">(</span>
        <span class="n">NoZeroSizedOutputs</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;(),</span>
        <span class="n">FirstComposition</span><span class="p">(</span>
            <span class="n">SetLifecycle</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;(),</span>
            <span class="n">AllComposition</span><span class="p">(</span>
                <span class="n">VerifyLifecycle</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;,</span> <span class="n">P</span><span class="p">&gt;(),</span>
                <span class="n">FirstComposition</span><span class="p">(</span>
                    <span class="n">Settle</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;(),</span>
                    <span class="n">Issue</span><span class="p">(),</span>
                    <span class="n">ConserveAmount</span><span class="p">()</span>
                <span class="p">)</span>
            <span class="p">)</span>
        <span class="p">)</span>
    <span class="p">)</span>
 <span class="p">)</span> <span class="p">{</span>
    <span class="k">override</span> <span class="k">fun</span> <span class="nf">groupStates</span><span class="p">(</span><span class="n">tx</span><span class="p">:</span> <span class="n">TransactionForContract</span><span class="p">):</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">TransactionForContract</span><span class="p">.</span><span class="n">InOutGroup</span><span class="p">&lt;</span><span class="n">Obligation</span><span class="p">.</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;&gt;&gt;</span>
            <span class="p">=</span> <span class="n">tx</span><span class="p">.</span><span class="n">groupStates</span><span class="p">&lt;</span><span class="n">Obligation</span><span class="p">.</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;&gt;</span> <span class="p">{</span> <span class="n">it</span><span class="p">.</span><span class="n">amount</span><span class="p">.</span><span class="n">token</span> <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
 </div>
 </div>
 <p>Usually it&#8217;s convenient to use <code class="docutils literal"><span class="pre">groupStates</span></code> function defined on <code class="docutils literal"><span class="pre">TransactionForContract</span></code> class. Which given a type and a
 selector function, that returns a grouping key, associates inputs and outputs together so that they can be processed as one.
 The grouping key is any arbitrary object that can act as a map key (so must implement equals and hashCode).</p>
 </div>
 <div class="section" id="abstractconserveamount">
 <h3>AbstractConserveAmount<a class="headerlink" href="#abstractconserveamount" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Standardised clause for checking input/output balances of fungible assets. Requires that a
 Move command is provided, and errors if absent. Conserve amount clause can only be used on grouped states.</p>
 <p><strong>Usage</strong></p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="cm">/**</span>
 <span class="cm"> * Generic move/exit clause for fungible assets</span>
 <span class="cm"> */</span>
 <span class="k">class</span> <span class="nc">ConserveAmount</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;</span> <span class="p">:</span> <span class="n">AbstractConserveAmount</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Terms</span><span class="p">&lt;</span><span class="n">P</span><span class="p">&gt;&gt;()</span>
 </pre></div>
 </div>
 </div>
 <p>See code in <a class="reference internal" href="#groupclauseverifier">GroupClauseVerifier</a>.</p>
 </div>
 <div class="section" id="abstractissue">
 <h3>AbstractIssue<a class="headerlink" href="#abstractissue" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Standard issue clause for contracts that issue fungible assets.</p>
 <p><strong>Usage</strong></p>
 <p>Example from <code class="docutils literal"><span class="pre">CommercialPaper.kt</span></code>:</p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">Issue</span> <span class="p">:</span> <span class="n">AbstractIssue</span><span class="p">&lt;</span><span class="n">State</span><span class="p">,</span> <span class="n">Commands</span><span class="p">,</span> <span class="n">Terms</span><span class="p">&gt;(</span>
        <span class="p">{</span> <span class="n">map</span> <span class="p">{</span> <span class="n">Amount</span><span class="p">(</span><span class="n">it</span><span class="p">.</span><span class="n">faceValue</span><span class="p">.</span><span class="n">quantity</span><span class="p">,</span> <span class="n">it</span><span class="p">.</span><span class="n">token</span><span class="p">)</span> <span class="p">}.</span><span class="n">sumOrThrow</span><span class="p">()</span> <span class="p">},</span>
        <span class="p">{</span> <span class="n">token</span> <span class="p">-&gt;</span> <span class="n">map</span> <span class="p">{</span> <span class="n">Amount</span><span class="p">(</span><span class="n">it</span><span class="p">.</span><span class="n">faceValue</span><span class="p">.</span><span class="n">quantity</span><span class="p">,</span> <span class="n">it</span><span class="p">.</span><span class="n">token</span><span class="p">)</span> <span class="p">}.</span><span class="n">sumOrZero</span><span class="p">(</span><span class="n">token</span><span class="p">)</span> <span class="p">})</span> <span class="p">{</span>
    <span class="k">override</span> <span class="k">val</span> <span class="py">requiredCommands</span><span class="p">:</span> <span class="n">Set</span><span class="p">&lt;</span><span class="n">Class</span><span class="p">&lt;</span><span class="k">out</span> <span class="n">CommandData</span><span class="p">&gt;&gt;</span> <span class="p">=</span> <span class="n">setOf</span><span class="p">(</span><span class="n">Commands</span><span class="p">.</span><span class="n">Issue</span><span class="o">::</span><span class="k">class</span><span class="p">.</span><span class="n">java</span><span class="p">)</span>
    <span class="k">override</span> <span class="k">fun</span> <span class="nf">verify</span><span class="p">(</span><span class="n">tx</span><span class="p">:</span> <span class="n">TransactionForContract</span><span class="p">,</span>
                        <span class="n">inputs</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&gt;,</span>
                        <span class="n">outputs</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">State</span><span class="p">&gt;,</span>
                        <span class="n">commands</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">AuthenticatedObject</span><span class="p">&lt;</span><span class="n">Commands</span><span class="p">&gt;&gt;,</span>
                        <span class="n">groupingKey</span><span class="p">:</span> <span class="n">Issued</span><span class="p">&lt;</span><span class="n">Terms</span><span class="p">&gt;?):</span> <span class="n">Set</span><span class="p">&lt;</span><span class="n">Commands</span><span class="p">&gt;</span> <span class="p">{</span>
        <span class="k">val</span> <span class="py">consumedCommands</span> <span class="p">=</span> <span class="k">super</span><span class="p">.</span><span class="n">verify</span><span class="p">(</span><span class="n">tx</span><span class="p">,</span> <span class="n">inputs</span><span class="p">,</span> <span class="n">outputs</span><span class="p">,</span> <span class="n">commands</span><span class="p">,</span> <span class="n">groupingKey</span><span class="p">)</span>
        <span class="p">...</span>
 </pre></div>
 </div>
 </div>
 <p>First function in constructor converts a list of states into an amount of the token. Must error if there are no states in the list.
 Second function converts a list of states into an amount of the token, and returns zero if there are no states in the list.
 Takes in an instance of the token definition for constructing the zero amount if needed.</p>
 </div>
 <div class="section" id="nozerosizedoutputs">
 <h3>NoZeroSizedOutputs<a class="headerlink" href="#nozerosizedoutputs" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Clause for fungible asset contracts, which enforces that no output state should have a balance of zero.</p>
 <p><strong>Usage</strong></p>
 <p>See code in <a class="reference internal" href="#groupclauseverifier">GroupClauseVerifier</a>.</p>
 </div>
 <div class="section" id="filteron">
 <h3>FilterOn<a class="headerlink" href="#filteron" title="Permalink to this headline">¶</a></h3>
 <p><strong>Description</strong></p>
 <p>Filter the states that are passed through to the wrapped clause, to restrict them to a specific type.</p>
 <p><code class="docutils literal"><span class="pre">FilterOn</span></code> narrows the scope of the states being verified.
 Let&#8217;s take a transaction with multiple cash states of different currencies, we want to run a clause that focuses
 on only GBP cash states rather than all cash states.</p>
 <p><strong>Usage</strong></p>
 <div class="codeset container">
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="n">FilterOn</span><span class="p">(</span><span class="n">clause</span><span class="p">,</span> <span class="p">{</span> <span class="n">states</span> <span class="p">-&gt;</span> <span class="n">states</span><span class="p">.</span><span class="n">filter</span> <span class="p">{</span> <span class="n">it</span><span class="p">.</span><span class="n">amount</span><span class="p">.</span><span class="n">token</span> <span class="p">==</span> <span class="n">GBP</span><span class="p">}</span> <span class="p">})</span>
 </pre></div>
 </div>
 </div>
 <p>Takes <code class="docutils literal"><span class="pre">filterStates</span></code> function that limits states passed to <code class="docutils literal"><span class="pre">clause</span></code> verification.</p>
 </div>
 </div>
 </div>
           </div>
          </div>
          <footer>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
        <a href="creating-a-cordapp.html" class="btn btn-neutral float-right" title="CorDapps Background" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="consensus.html" class="btn btn-neutral" title="Consensus model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
  <hr/>
  <div role="contentinfo">
    <p>
        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
 </footer>
        </div>
      </div>
    </section>
  </div>
    <script type="text/javascript">
        var DOCUMENTATION_OPTIONS = {
            URL_ROOT:'./',
            VERSION:'latest',
            COLLAPSE_INDEX:false,
            FILE_SUFFIX:'.html',
            HAS_SOURCE:  true
        };
    </script>
      <script type="text/javascript" src="_static/jquery.js"></script>
      <script type="text/javascript" src="_static/underscore.js"></script>
      <script type="text/javascript" src="_static/doctools.js"></script>
    <script type="text/javascript" src="_static/js/theme.js"></script>
  <script type="text/javascript">
      jQuery(function () {
          SphinxRtdTheme.StickyNav.enable();
      });
  </script>
 </body>
 </html>
--- a/docs/build/html/clientrpc.html
+++ b/docs/build/html/clientrpc.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Networking and messaging" href="messaging.html"/>
-        <link rel="prev" title="Consensus model" href="consensus.html"/> 
+        <link rel="prev" title="The CorDapp Template" href="tutorial-cordapp.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -119,23 +131,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -152,6 +162,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -284,7 +296,7 @@ This is likely to change in a future release.</p>
 <p>In the present implementation of the node we use Kryo to generate the <em>on the wire</em> representation of contracts states
 or any other classes that form part of the RPC arguments or response.  To avoid the RPC interface being wide open to all
 classes on the classpath, Cordapps will currently have to register any classes or custom serialisers they require with Kryo
-if they are not one of those registered by default in <code class="docutils literal"><span class="pre">RPCKryo</span></code> via the plugin architecture.  See <a class="reference internal" href="creating-a-cordapp.html"><span class="doc">Creating a CorDapp</span></a>.
+if they are not one of those registered by default in <code class="docutils literal"><span class="pre">RPCKryo</span></code> via the plugin architecture.  See <a class="reference internal" href="creating-a-cordapp.html"><span class="doc">CorDapps Background</span></a>.
 This will require some familiarity with Kryo.  An example is shown in <a class="reference internal" href="tutorial-clientrpc-api.html"><span class="doc">Client RPC API tutorial</span></a>.</p>
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
@ -304,7 +316,7 @@ customisation point will either go away completely or change.</p>
        <a href="messaging.html" class="btn btn-neutral float-right" title="Networking and messaging" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="consensus.html" class="btn btn-neutral" title="Consensus model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="tutorial-cordapp.html" class="btn btn-neutral" title="The CorDapp Template" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -313,7 +325,7 @@ customisation point will either go away completely or change.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/codestyle.html
+++ b/docs/build/html/codestyle.html
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,40 +116,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<ul>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
-<li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Flow state machines</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -416,7 +433,7 @@ there must be an accompanying explanation in the code for why the warning is a f
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/consensus.html
+++ b/docs/build/html/consensus.html
@ -31,7 +31,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Client RPC" href="clientrpc.html"/>
+        <link rel="next" title="Clauses key concepts" href="clauses.html"/>
        <link rel="prev" title="Transaction tear-offs" href="merkle-trees.html"/> 
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul class="current">
@ -106,6 +108,16 @@
 <li class="toctree-l2"><a class="reference internal" href="#timestamping">Timestamping</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -119,23 +131,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -152,6 +162,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -348,7 +360,7 @@ clocks at the US Naval Observatory. This time feed is extremely accurate and ava
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="clientrpc.html" class="btn btn-neutral float-right" title="Client RPC" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="clauses.html" class="btn btn-neutral float-right" title="Clauses key concepts" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="merkle-trees.html" class="btn btn-neutral" title="Transaction tear-offs" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@ -360,7 +372,7 @@ clocks at the US Naval Observatory. This time feed is extremely accurate and ava
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/contract-catalogue.html
+++ b/docs/build/html/contract-catalogue.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -150,6 +160,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -286,7 +298,7 @@ multilateral netting).</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/contract-irs.html
+++ b/docs/build/html/contract-irs.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -147,6 +157,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -304,7 +316,7 @@ equivalent <code class="docutils literal"><span class="pre">FixedRatePaymentEven
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/corda-configuration-file.html
+++ b/docs/build/html/corda-configuration-file.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -116,23 +128,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -149,6 +159,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -313,7 +325,7 @@ uses HOCON format see <a class="reference external" href="https://github.com/typ
 </td>
 </tr>
 <tr class="field-even field"><th class="field-name" colspan="2">extraAdvertisedServiceIds:</th></tr>
-<tr class="field-even field"><td>&nbsp;</td><td class="field-body"><p class="first">A list of ServiceType id strings to be advertised to the NetworkMapService and thus be available when other nodes query the NetworkMapCache for supporting nodes. This can also include plugin services loaded from .jar files in the plugins folder.</p>
+<tr class="field-even field"><td>&nbsp;</td><td class="field-body"><p class="first">A list of ServiceType id strings to be advertised to the NetworkMapService and thus be available when other nodes query the NetworkMapCache for supporting nodes. This can also include plugin services loaded from .jar files in the plugins folder. Optionally, a custom advertised service name can be provided by appending it to the service type id: <code class="docutils literal"><span class="pre">&quot;corda.notary.validating|Notary</span> <span class="pre">A&quot;</span></code></p>
 </td>
 </tr>
 <tr class="field-odd field"><th class="field-name" colspan="2">notaryNodeAddress:</th></tr>
@ -381,7 +393,7 @@ following fields:</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/corda-plugins.html
+++ b/docs/build/html/corda-plugins.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -143,6 +153,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -204,7 +216,7 @@ by numerous application extensions (CorDapps). These extensions will
 package together all of the Corda contract code, state structures,
 protocols/flows to create and modify state as well as RPC extensions for
 node clients. Details of writing these CorDapps is given elsewhere
-<a class="reference internal" href="creating-a-cordapp.html"><span class="doc">Creating a CorDapp</span></a>.</p>
+<a class="reference internal" href="creating-a-cordapp.html"><span class="doc">CorDapps Background</span></a>.</p>
 <p>To enable these plugins to register dynamically with the Corda framework
 the node uses the Java <code class="docutils literal"><span class="pre">ServiceLoader</span></code> to locate and load the plugin
 components during the <code class="docutils literal"><span class="pre">AbstractNode.start</span></code> call. Therefore,
@ -254,8 +266,14 @@ the scheduler.</p>
 <p>d. The <code class="docutils literal"><span class="pre">servicePlugins</span></code> property returns a list of classes which will
 be instantiated once during the <code class="docutils literal"><span class="pre">AbstractNode.start</span></code> call. These
 classes must provide a single argument constructor which will receive a
-<code class="docutils literal"><span class="pre">PluginServiceHub</span></code> reference. These singleton instances are regarded
+<code class="docutils literal"><span class="pre">PluginServiceHub</span></code> reference. They must also extend the abstract class
-as trusted components and can be used for a number of purposes.</p>
+<code class="docutils literal"><span class="pre">SingletonSerializeAsToken</span></code> which ensures that if any reference to your
 service is captured in a flow checkpoint (i.e. serialized by Kryo as
 part of Quasar checkpoints, either on the stack or by reference within
 your flows) it is stored as a simple token representing your service.
 When checkpoints are restored, after a node restart for example,
 the latest instance of the service will be substituted back in place of
 the token stored in the checkpoint.</p>
 <blockquote>
 <div><p>i. Firstly, they can call <code class="docutils literal"><span class="pre">PluginServiceHub.registerFlowInitiator</span></code> and
 register flows that will be initiated locally in response to remote flow
@ -267,7 +285,7 @@ typically be exposed to other nodes by flows which are given a reference
 to the service plugin when initiated (as defined by the
 <code class="docutils literal"><span class="pre">registerFlowInitiator</span></code> call). The flow can then call into functions
 on the plugin service singleton. Note, care should be taken to not allow
-flows to hold references to plugin services, or fields which are not
+flows to hold references to fields which are not
 also <code class="docutils literal"><span class="pre">SingletonSerializeAsToken</span></code>, otherwise Quasar suspension in the
 <code class="docutils literal"><span class="pre">StateMachineManager</span></code> will fail with exceptions. An example oracle can
 be seen in <code class="docutils literal"><span class="pre">NodeInterestRates.kt</span></code> in the irs-demo sample.</p>
@ -304,7 +322,7 @@ various threads and needs to be stable and thread safe.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/creating-a-cordapp.html
+++ b/docs/build/html/creating-a-cordapp.html
@ -8,7 +8,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Creating a CorDapp &mdash; R3 Corda latest documentation</title>
+  <title>CorDapps Background &mdash; R3 Corda latest documentation</title>
@ -31,8 +31,8 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Where to start" href="where-to-start.html"/>
+        <link rel="next" title="The CorDapp Template" href="tutorial-cordapp.html"/>
-        <link rel="prev" title="Network permissioning" href="permissioning.html"/> 
+        <link rel="prev" title="Clauses key concepts" href="clauses.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,22 +99,11 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="clientrpc.html">Client RPC</a></li>
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Creating a CorDapp</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="#">CorDapps Background</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#app-plugins">App plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#services">Services</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#starting-nodes">Starting nodes</a></li>
@ -130,19 +121,38 @@
 <li class="toctree-l2"><a class="reference internal" href="#cordformation">Cordformation</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="clientrpc.html">Client RPC</a></li>
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -159,6 +169,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -199,7 +211,7 @@
  <ul class="wy-breadcrumbs">
    <li><a href="index.html">Docs</a> &raquo;</li>
-    <li>Creating a CorDapp</li>
+    <li>CorDapps Background</li>
      <li class="wy-breadcrumbs-aside">
@ -213,8 +225,8 @@
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
           <div itemprop="articleBody">
-  <div class="section" id="creating-a-cordapp">
+  <div class="section" id="cordapps-background">
-<h1>Creating a CorDapp<a class="headerlink" href="#creating-a-cordapp" title="Permalink to this headline">¶</a></h1>
+<h1>CorDapps Background<a class="headerlink" href="#cordapps-background" title="Permalink to this headline">¶</a></h1>
 <p>A Cordapp is an application that runs on the Corda platform using the platform APIs and plugin system. They are self
 contained in separate JARs from the node server JAR that are created and distributed.</p>
 <div class="section" id="app-plugins">
@ -235,8 +247,8 @@ specific details of the implementation, but you can extend the server in the fol
 </div>
 <div class="section" id="services">
 <h2>Services<a class="headerlink" href="#services" title="Permalink to this headline">¶</a></h2>
-<p>Services are classes which are constructed after the node has started. It is provided a <a class="reference external" href="api/net.corda.node.services.api/-service-hub-internal/index.html">ServiceHubInternal</a> which
+<p>Services are classes which are constructed after the node has started. It is provided a <a class="reference external" href="api/net.corda.core.node/-plugin-service-hub/index.html">PluginServiceHub</a> which
-allows a richer API than the <a class="reference external" href="api/net.corda.node.services.api/-service-hub/index.html">ServiceHub</a> exposed to contracts. It enables adding flows, registering
+allows a richer API than the <a class="reference external" href="api/net.corda.core.node/-service-hub/index.html">ServiceHub</a> exposed to contracts. It enables adding flows, registering
 message handlers and more. The service does not run in a separate thread, so the only entry point to the service is during
 construction, where message handlers should be registered and threads started.</p>
 </div>
@ -445,10 +457,10 @@ one node per window.</p>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="where-to-start.html" class="btn btn-neutral float-right" title="Where to start" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="tutorial-cordapp.html" class="btn btn-neutral float-right" title="The CorDapp Template" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="permissioning.html" class="btn btn-neutral" title="Network permissioning" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="clauses.html" class="btn btn-neutral" title="Clauses key concepts" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -457,7 +469,7 @@ one node per window.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/data-model.html
+++ b/docs/build/html/data-model.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Data types" href="transaction-data-types.html"/>
-        <link rel="prev" title="Running the demos" href="running-the-demos.html"/> 
+        <link rel="prev" title="CLI vs IDE" href="CLI-vs-IDE.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul class="current">
@ -104,8 +106,18 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -113,42 +125,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -471,7 +486,7 @@ something that can be trivially fixed with data model changes.</p>
        <a href="transaction-data-types.html" class="btn btn-neutral float-right" title="Data types" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="running-the-demos.html" class="btn btn-neutral" title="Running the demos" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="CLI-vs-IDE.html" class="btn btn-neutral" title="CLI vs IDE" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -480,7 +495,7 @@ something that can be trivially fixed with data model changes.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/event-scheduling.html
+++ b/docs/build/html/event-scheduling.html
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,25 +116,27 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Event scheduling</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a></li>
@ -134,17 +148,18 @@
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -310,7 +325,7 @@ the handler needs to be manually installed in the node.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/flow-state-machines.html
+++ b/docs/build/html/flow-state-machines.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Writing flow tests" href="flow-testing.html"/>
-        <link rel="prev" title="Client RPC API tutorial" href="tutorial-clientrpc-api.html"/> 
+        <link rel="prev" title="Building Transactions" href="tutorial-building-transactions.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,18 +122,14 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Writing flows</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#theory">Theory</a></li>
@ -140,6 +148,8 @@
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -156,6 +166,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -767,7 +779,7 @@ reporting logic, or anything else that might be required as part of a communicat
        <a href="flow-testing.html" class="btn btn-neutral float-right" title="Writing flow tests" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="tutorial-clientrpc-api.html" class="btn btn-neutral" title="Client RPC API tutorial" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="tutorial-building-transactions.html" class="btn btn-neutral" title="Building Transactions" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -776,7 +788,7 @@ reporting logic, or anything else that might be required as part of a communicat
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/flow-testing.html
+++ b/docs/build/html/flow-testing.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -143,6 +153,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -313,7 +325,7 @@ here.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/further-notes-on-kotlin.html
+++ b/docs/build/html/further-notes-on-kotlin.html
@ -87,14 +87,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -102,42 +114,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -215,7 +230,7 @@ to write contracts in both Kotlin and Java. You can <a class="reference external
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/genindex.html
+++ b/docs/build/html/genindex.html
@ -88,7 +88,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -96,6 +98,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -109,23 +121,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -142,6 +152,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -211,7 +223,7 @@
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/getting-set-up-fault-finding.html
+++ b/docs/build/html/getting-set-up-fault-finding.html
@ -31,6 +31,8 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Running the demos" href="running-the-demos.html"/>
        <link rel="prev" title="Getting set up" href="getting-set-up.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -84,17 +86,46 @@
                <p class="caption"><span class="caption-text">Getting started</span></p>
-<ul>
+<ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Getting Set Up : Faultfinding</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#intellij-issues">IntelliJ issues</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#run-configurations-are-missing">Run configurations are missing</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#if-intellij-complains-about-lack-of-an-sdk">If IntelliJ complains about lack of an SDK</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#kotlin-issues">Kotlin issues</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#installation">Installation</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#gradle-issues">Gradle issues</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#gradle-within-intellij">Gradle within IntelliJ</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#gradle-via-the-cli">Gradle via the CLI</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#doing-it-without-intellij">Doing it without IntelliJ</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -102,42 +133,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -196,6 +230,17 @@
 <h1>Getting Set Up : Faultfinding<a class="headerlink" href="#getting-set-up-faultfinding" title="Permalink to this headline">¶</a></h1>
 <div class="section" id="intellij-issues">
 <h2>IntelliJ issues<a class="headerlink" href="#intellij-issues" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="run-configurations-are-missing">
 <h3>Run configurations are missing<a class="headerlink" href="#run-configurations-are-missing" title="Permalink to this headline">¶</a></h3>
 <p>If you opened the Corda project using &#8220;Import&#8221; from the IntelliJ splash screen rather than using &#8220;Open&#8221; and then
 importing the Gradle build system from the popup bubble, then a bug in IntelliJ will cause it to wipe and recreate
 the <code class="docutils literal"><span class="pre">.idea</span></code> directory where the run configurations are stored. The fix is simple and doesn&#8217;t require you to
 re-import the project: just undelete the files! You can do that by either:</p>
 <ol class="arabic simple">
 <li>Running <code class="docutils literal"><span class="pre">git</span> <span class="pre">checkout</span> <span class="pre">.idea/runConfigurations</span></code> to restore that part of the tree to its normal state.</li>
 <li>Using the &#8220;Version Control&#8221; pane in IntelliJ to undelete the files via the GUI.</li>
 </ol>
 </div>
 <div class="section" id="if-intellij-complains-about-lack-of-an-sdk">
 <h3>If IntelliJ complains about lack of an SDK<a class="headerlink" href="#if-intellij-complains-about-lack-of-an-sdk" title="Permalink to this headline">¶</a></h3>
 <p>If on attempting to open the project (including importing Gradle project), IntelliJ refuses because an SDK was not selected,
@ -253,12 +298,21 @@ opened by clicking on &#8220;Event Log&#8221; at the bottom right of the Intelli
          </div>
          <footer>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
        <a href="running-the-demos.html" class="btn btn-neutral float-right" title="Running the demos" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="getting-set-up.html" class="btn btn-neutral" title="Getting set up" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
  <hr/>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/getting-set-up.html
+++ b/docs/build/html/getting-set-up.html
@ -31,7 +31,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Running the demos" href="running-the-demos.html"/>
+        <link rel="next" title="Getting Set Up : Faultfinding" href="getting-set-up-fault-finding.html"/>
        <link rel="prev" title="What’s included?" href="inthebox.html"/> 
@ -98,7 +98,9 @@
 <li class="toctree-l2"><a class="reference internal" href="#troubleshooting">Troubleshooting</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -106,6 +108,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -119,23 +131,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -152,6 +162,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -224,6 +236,14 @@ do have with them.</p>
 <p>We strongly recommend the use of IntelliJ&#8217;s Development Environment known as IDEA. Download it for free from
 <a class="reference external" href="https://www.jetbrains.com/idea/download/">JetBrains</a>. The primary reason we recommend this particular IDE is that it integrates
 very well with our choice of language for Corda, &#8220;Kotlin&#8221;, as Jetbrains also support the development of Kotlin.</p>
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
 <p class="last">When opening the Corda project for the first time from the IntelliJ splash screen, please use &#8220;Open&#8221;
 and then agree to import the Gradle project from the popup bubble. Don&#8217;t pick &#8220;Import&#8221; on the splash screen,
 because a bug in IntelliJ will cause the pre-packaged run configurations to be erased. If you see this warning
 too late, it&#8217;s no problem, just use <code class="docutils literal"><span class="pre">git</span> <span class="pre">checkout</span> <span class="pre">.idea/runConfiguration</span></code> or the version control tab in IntelliJ
 to undelete the files.</p>
 </div>
 </div>
 <div class="section" id="kotlin">
 <h2>Kotlin<a class="headerlink" href="#kotlin" title="Permalink to this headline">¶</a></h2>
@ -274,7 +294,7 @@ are performing (details expounded later). Whenever prompted about gradle, accept
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="running-the-demos.html" class="btn btn-neutral float-right" title="Running the demos" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="getting-set-up-fault-finding.html" class="btn btn-neutral float-right" title="Getting Set Up : Faultfinding" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="inthebox.html" class="btn btn-neutral" title="What’s included?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@ -286,7 +306,7 @@ are performing (details expounded later). Whenever prompted about gradle, accept
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/glossary.html
+++ b/docs/build/html/glossary.html
@ -88,14 +88,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -103,42 +115,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -286,7 +301,7 @@
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/index.html
+++ b/docs/build/html/index.html
@ -8,7 +8,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Welcome to the Corda! &mdash; R3 Corda latest documentation</title>
+  <title>Welcome to the Corda documentation! &mdash; R3 Corda latest documentation</title>
@ -88,7 +88,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -96,6 +98,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -109,23 +121,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -142,6 +152,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -182,7 +194,7 @@
  <ul class="wy-breadcrumbs">
    <li><a href="#">Docs</a> &raquo;</li>
-    <li>Welcome to the Corda!</li>
+    <li>Welcome to the Corda documentation!</li>
      <li class="wy-breadcrumbs-aside">
@ -196,8 +208,8 @@
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
           <div itemprop="articleBody">
-  <div class="section" id="welcome-to-the-corda">
+  <div class="section" id="welcome-to-the-corda-documentation">
-<h1>Welcome to the Corda!<a class="headerlink" href="#welcome-to-the-corda" title="Permalink to this headline">¶</a></h1>
+<h1>Welcome to the Corda documentation!<a class="headerlink" href="#welcome-to-the-corda-documentation" title="Permalink to this headline">¶</a></h1>
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
 <p class="last">This build of the docs is from the <em>master branch</em>, not a milestone release. It may not reflect the
@ -231,12 +243,26 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l2"><a class="reference internal" href="getting-set-up.html#troubleshooting">Troubleshooting</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="getting-set-up-fault-finding.html#intellij-issues">IntelliJ issues</a></li>
 <li class="toctree-l2"><a class="reference internal" href="getting-set-up-fault-finding.html#kotlin-issues">Kotlin issues</a></li>
 <li class="toctree-l2"><a class="reference internal" href="getting-set-up-fault-finding.html#gradle-issues">Gradle issues</a></li>
 <li class="toctree-l2"><a class="reference internal" href="getting-set-up-fault-finding.html#doing-it-without-intellij">Doing it without IntelliJ</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#important-common-instructions-for-all-demos">Important : Common Instructions for all demos</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#trader-demo">Trader demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#irs-demo">IRS demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#attachment-demo">Attachment demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#simm-and-portfolio-demo">SIMM and Portfolio demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#distributed-notary-demo">Distributed Notary demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="running-the-demos.html#simm-and-portfolio-demo-aka-the-initial-margin-agreement-demo">SIMM and Portfolio Demo - aka the Initial Margin Agreement Demo</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="CLI-vs-IDE.html#ide-intellij">IDE - IntelliJ</a></li>
 <li class="toctree-l2"><a class="reference internal" href="CLI-vs-IDE.html#command-line">Command Line</a></li>
 <li class="toctree-l2"><a class="reference internal" href="CLI-vs-IDE.html#debugging">Debugging</a></li>
 </ul>
 </li>
 </ul>
@ -278,6 +304,59 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l2"><a class="reference internal" href="consensus.html#timestamping">Timestamping</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="clauses.html#basic-clause-structure">Basic clause structure</a></li>
 <li class="toctree-l2"><a class="reference internal" href="clauses.html#composition-clauses">Composition clauses</a></li>
 <li class="toctree-l2"><a class="reference internal" href="clauses.html#other-types-of-clauses">Other types of clauses</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="toctree-wrapper compound" id="cordapps">
 <p class="caption"><span class="caption-text">CorDapps</span><a class="headerlink" href="#cordapps" title="Permalink to this toctree">¶</a></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#app-plugins">App plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#services">Services</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#starting-nodes">Starting nodes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#installing-apps">Installing apps</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#starting-your-node">Starting your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#debugging-your-node">Debugging your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#viewing-persisted-state-of-your-node">Viewing persisted state of your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#building-against-corda">Building against Corda</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#building-gradle-plugins">Building Gradle plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#using-gradle-plugins">Using Gradle plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#template-build-gradle">Template build.gradle</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#cordformation">Cordformation</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#getting-started">Getting started</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#working-from-milestone-releases">Working from milestone releases</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#using-a-snapshot-release">Using a SNAPSHOT release</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#opening-the-cordapp-template-with-intellij">Opening the CorDapp Template with IntelliJ</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp-from-the-command-line">Running the Sample CorDapp from the command line</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#running-cordapps-on-separate-machines">Running CorDapps on separate machines</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#running-the-example-cordapp-via-intellij">Running the example CorDapp via IntelliJ</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#background">Background</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#interfaces">Interfaces</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#cordapp-template-project-structure">CorDapp-template Project Structure</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#the-build-gradle-file">The build.gradle File</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#service-provider-configuration-file">Service Provider Configuration File</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#re-deploying-your-nodes-locally">Re-Deploying Your Nodes Locally</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-cordapp.html#debugging-your-cordapp">Debugging your CorDapp</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="toctree-wrapper compound" id="the-corda-node">
@ -343,36 +422,9 @@ you already have read the relevant sections of the technology white paper and no
 </li>
 </ul>
 </div>
 <div class="toctree-wrapper compound" id="cordapps">
 <p class="caption"><span class="caption-text">CorDapps</span><a class="headerlink" href="#cordapps" title="Permalink to this toctree">¶</a></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#app-plugins">App plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#services">Services</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#starting-nodes">Starting nodes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#installing-apps">Installing apps</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#starting-your-node">Starting your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#debugging-your-node">Debugging your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#viewing-persisted-state-of-your-node">Viewing persisted state of your node</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#building-against-corda">Building against Corda</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#building-gradle-plugins">Building Gradle plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#using-gradle-plugins">Using Gradle plugins</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#template-build-gradle">Template build.gradle</a></li>
 <li class="toctree-l2"><a class="reference internal" href="creating-a-cordapp.html#cordformation">Cordformation</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="toctree-wrapper compound" id="tutorials">
 <p class="caption"><span class="caption-text">Tutorials</span><a class="headerlink" href="#tutorials" title="Permalink to this toctree">¶</a></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="where-to-start.html#the-trader-demo">The trader demo</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract.html#where-to-put-your-code">Where to put your code</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract.html#starting-the-commercial-paper-class">Starting the commercial paper class</a></li>
@ -391,8 +443,10 @@ you already have read the relevant sections of the technology white paper and no
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#what-are-clauses-and-why-to-use-them">What are clauses and why to use them?</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#how-clauses-work">How clauses work?</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#commercial-paper-class">Commercial paper class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#clauses">Clauses</a></li>
+<li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#simple-clauses">Simple Clauses</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#group-clause">Group clause</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#summary">Summary</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-contract-clauses.html#debugging">Debugging</a></li>
@ -403,8 +457,22 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l2"><a class="reference internal" href="tutorial-test-dsl.html#chaining-transactions">Chaining transactions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-clientrpc-api.html#registering-classes-from-your-cordapp-with-rpc-kryo">Registering classes from your CorDapp with RPC Kryo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-clientrpc-api.html#security">Security</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#introduction">Introduction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#the-basic-lifecycle-of-transactions">The Basic Lifecycle Of Transactions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#gathering-inputs">Gathering Inputs</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#generating-commands">Generating Commands</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#generating-outputs">Generating Outputs</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#building-the-wiretransaction">Building the WireTransaction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#completing-the-signedtransaction">Completing the SignedTransaction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#committing-the-transaction">Committing the Transaction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-building-transactions.html#partially-visible-transactions">Partially Visible Transactions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a><ul>
@ -432,9 +500,17 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#introduction">Introduction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#the-two-basic-approaches">The two basic approaches</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#asserting-continuously-varying-data">Asserting continuously varying data</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#hiding-transaction-data-from-the-oracle">Hiding transaction data from the oracle</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#pay-per-play-oracles">Pay-per-play oracles</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#implement-the-core-classes">Implement the core classes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#binding-to-the-network-via-cordapp-plugin">Binding to the network via CorDapp plugin</a></li>
 <li class="toctree-l2"><a class="reference internal" href="oracles.html#providing-client-sub-flows-for-querying-and-signing">Providing client sub-flows for querying and signing</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="tutorial-attachments.html#attachments-demo">Attachments demo</a></li>
 </ul>
@ -491,6 +567,15 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l2"><a class="reference internal" href="loadtesting.html#how-to-write-a-load-test">How to write a load test</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="setting-up-a-corda-network.html#certificates">Certificates</a></li>
 <li class="toctree-l2"><a class="reference internal" href="setting-up-a-corda-network.html#configuration">Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="setting-up-a-corda-network.html#starting-the-nodes">Starting the nodes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="setting-up-a-corda-network.html#logging">Logging</a></li>
 <li class="toctree-l2"><a class="reference internal" href="setting-up-a-corda-network.html#connecting-to-the-nodes">Connecting to the nodes</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="secure-coding-guidelines.html#flows">Flows</a></li>
 <li class="toctree-l2"><a class="reference internal" href="secure-coding-guidelines.html#contracts">Contracts</a></li>
@ -499,6 +584,7 @@ you already have read the relevant sections of the technology white paper and no
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-notes.html">Release notes</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="release-notes.html#milestone-6">Milestone 6</a></li>
 <li class="toctree-l2"><a class="reference internal" href="release-notes.html#milestone-5">Milestone 5</a></li>
 <li class="toctree-l2"><a class="reference internal" href="release-notes.html#milestone-4">Milestone 4</a></li>
 <li class="toctree-l2"><a class="reference internal" href="release-notes.html#milestone-3">Milestone 3</a></li>
@ -548,7 +634,7 @@ you already have read the relevant sections of the technology white paper and no
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/initial-margin-agreement.html
+++ b/docs/build/html/initial-margin-agreement.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -148,6 +158,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -295,7 +307,7 @@ ISDA SIMM agreement (if none, then use the demo to enter some simple trades as d
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/inthebox.html
+++ b/docs/build/html/inthebox.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Getting set up" href="getting-set-up.html"/>
-        <link rel="prev" title="Welcome to the Corda!" href="index.html"/> 
+        <link rel="prev" title="Welcome to the Corda documentation!" href="index.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,14 +89,26 @@
 <ul class="current">
 <li class="toctree-l1 current"><a class="current reference internal" href="#">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,42 +116,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -233,7 +248,7 @@ Postgres, MySQL, SQL Server etc).</li>
        <a href="getting-set-up.html" class="btn btn-neutral float-right" title="Getting set up" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="index.html" class="btn btn-neutral" title="Welcome to the Corda!" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="index.html" class="btn btn-neutral" title="Welcome to the Corda documentation!" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -242,7 +257,7 @@ Postgres, MySQL, SQL Server etc).</li>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/loadtesting.html
+++ b/docs/build/html/loadtesting.html
@ -31,8 +31,8 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Secure coding guidelines" href="secure-coding-guidelines.html"/>
+        <link rel="next" title="Introduction - What is a corda network?" href="setting-up-a-corda-network.html"/>
-        <link rel="prev" title="Interest Rate Swaps" href="contract-irs.html"/> 
+        <link rel="prev" title="Interest rate swaps" href="contract-irs.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,38 +116,39 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
@ -146,6 +159,8 @@
 <li class="toctree-l2"><a class="reference internal" href="#how-to-write-a-load-test">How to write a load test</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -342,10 +357,10 @@ remoteSystemdServiceName = &quot;r3cev-node&quot;
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="secure-coding-guidelines.html" class="btn btn-neutral float-right" title="Secure coding guidelines" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="setting-up-a-corda-network.html" class="btn btn-neutral float-right" title="Introduction - What is a corda network?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="contract-irs.html" class="btn btn-neutral" title="Interest Rate Swaps" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="contract-irs.html" class="btn btn-neutral" title="Interest rate swaps" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -354,7 +369,7 @@ remoteSystemdServiceName = &quot;r3cev-node&quot;
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/merkle-trees.html
+++ b/docs/build/html/merkle-trees.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul class="current">
@ -102,6 +104,16 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -115,23 +127,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -148,6 +158,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -315,7 +327,7 @@ all of them. This issue will be handled after implementing partial signatures.</
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/messaging.html
+++ b/docs/build/html/messaging.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -114,23 +126,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -147,6 +157,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -266,7 +278,7 @@ The code simply picks the first registered node that supports the required servi
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/network-simulator.html
+++ b/docs/build/html/network-simulator.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -147,6 +157,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -279,7 +291,7 @@ of the window.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/node-administration.html
+++ b/docs/build/html/node-administration.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -117,23 +129,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -150,6 +160,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -323,7 +335,7 @@ EURIBOR 2016-03-15 2M = 0.111
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/node-explorer.html
+++ b/docs/build/html/node-explorer.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -115,23 +127,21 @@
 </li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -148,6 +158,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -315,7 +327,7 @@ The map provides a intuitive way of visualizing the Corda network and the partic
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/node-services.html
+++ b/docs/build/html/node-services.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -148,23 +160,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -181,6 +191,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -575,7 +587,7 @@ tables. To enable these features the contract state must implement the
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/objects.inv
+++ b/docs/build/html/objects.inv
--- a/docs/build/html/oracles.html
+++ b/docs/build/html/oracles.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Using attachments" href="tutorial-attachments.html"/>
-        <link rel="prev" title="Flow state machines" href="flow-state-machines.html"/> 
+        <link rel="prev" title="Using a notary service" href="using-a-notary.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,46 +116,57 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<ul>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
-<li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Flow state machines</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Writing oracle services</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#the-two-basic-approaches">The two basic approaches</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#asserting-continuously-varying-data">Asserting continuously varying data</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#hiding-transaction-data-from-the-oracle">Hiding transaction data from the oracle</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#pay-per-play-oracles">Pay-per-play oracles</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#implement-the-core-classes">Implement the core classes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#binding-to-the-network-via-cordapp-plugin">Binding to the network via CorDapp plugin</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#providing-client-sub-flows-for-querying-and-signing">Providing client sub-flows for querying and signing</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -262,10 +285,6 @@ attachment.</li>
 </div>
 <div class="section" id="asserting-continuously-varying-data">
 <h2>Asserting continuously varying data<a class="headerlink" href="#asserting-continuously-varying-data" title="Permalink to this headline">¶</a></h2>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last">A future version of the platform will include a complete tutorial on implementing this type of oracle.</p>
 </div>
 <p>Let&#8217;s look at the interest rates oracle that can be found in the <code class="docutils literal"><span class="pre">NodeInterestRates</span></code> file. This is an example of
 an oracle that uses a command because the current interest rate fix is a constantly changing fact.</p>
 <p>The obvious way to implement such a service is like this:</p>
@ -281,13 +300,13 @@ So the way we actually implement it is like this:</p>
 <li>The creator of the transaction that depends on the interest rate asks for the current rate. They can abort at this point
 if they want to.</li>
 <li>They insert a command with that rate and the time it was obtained into the transaction.</li>
-<li>They then send it to the oracle for signing, along with everyone else in parallel. The oracle checks that the command
+<li>They then send it to the oracle for signing, along with everyone else, potentially in parallel. The oracle checks that
-has correct data for the asserted time, and signs if so.</li>
+the command has the correct data for the asserted time, and signs if so.</li>
 </ol>
 <p>This same technique can be adapted to other types of oracle.</p>
 <p>The oracle consists of a core class that implements the query/sign operations (for easy unit testing), and then a separate
 class that binds it to the network layer.</p>
-<p>Here is an extract from the <code class="docutils literal"><span class="pre">NodeService.Oracle</span></code> class and supporting types:</p>
+<p>Here is an extract from the <code class="docutils literal"><span class="pre">NodeInterestRates.Oracle</span></code> class and supporting types:</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="cm">/** A [FixOf] identifies the question side of a fix: what day, tenor and type of fix (&quot;LIBOR&quot;, &quot;EURIBOR&quot; etc) */</span>
 <span class="k">data</span> <span class="k">class</span> <span class="nc">FixOf</span><span class="p">(</span><span class="k">val</span> <span class="py">name</span><span class="p">:</span> <span class="n">String</span><span class="p">,</span> <span class="k">val</span> <span class="py">forDay</span><span class="p">:</span> <span class="n">LocalDate</span><span class="p">,</span> <span class="k">val</span> <span class="py">ofTenor</span><span class="p">:</span> <span class="n">Duration</span><span class="p">)</span>
@ -295,14 +314,30 @@ class that binds it to the network layer.</p>
 <span class="k">data</span> <span class="k">class</span> <span class="nc">Fix</span><span class="p">(</span><span class="k">val</span> <span class="py">of</span><span class="p">:</span> <span class="n">FixOf</span><span class="p">,</span> <span class="k">val</span> <span class="py">value</span><span class="p">:</span> <span class="n">BigDecimal</span><span class="p">)</span> <span class="p">:</span> <span class="n">CommandData</span>
 <span class="k">class</span> <span class="nc">Oracle</span> <span class="p">{</span>
-    <span class="k">fun</span> <span class="nf">query</span><span class="p">(</span><span class="n">queries</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">FixOf</span><span class="p">&gt;):</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">Fix</span><span class="p">&gt;</span>
+    <span class="k">fun</span> <span class="nf">query</span><span class="p">(</span><span class="n">queries</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">FixOf</span><span class="p">&gt;,</span> <span class="n">deadline</span><span class="p">:</span> <span class="n">Instant</span><span class="p">):</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">Fix</span><span class="p">&gt;</span>
-    <span class="k">fun</span> <span class="nf">sign</span><span class="p">(</span><span class="n">wtx</span><span class="p">:</span> <span class="n">WireTransaction</span><span class="p">):</span> <span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span>
+    <span class="k">fun</span> <span class="nf">sign</span><span class="p">(</span><span class="n">ftx</span><span class="p">:</span> <span class="n">FilteredTransaction</span><span class="p">,</span> <span class="n">merkleRoot</span><span class="p">:</span> <span class="n">SecureHash</span><span class="p">):</span> <span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span>
 <span class="p">}</span>
 </pre></div>
 </div>
-<p>Because the fix contains a timestamp (the <code class="docutils literal"><span class="pre">forDay</span></code> field), there can be an arbitrary delay between a fix being
+<p>Because the fix contains a timestamp (the <code class="docutils literal"><span class="pre">forDay</span></code> field), that identifies the version of the data being requested,
-requested via <code class="docutils literal"><span class="pre">query</span></code> and the signature being requested via <code class="docutils literal"><span class="pre">sign</span></code>.</p>
+there can be an arbitrary delay between a fix being requested via <code class="docutils literal"><span class="pre">query</span></code> and the signature being requested via <code class="docutils literal"><span class="pre">sign</span></code>
 as the Oracle can know which, potentially historical, value it is being asked to sign for.  This is an important
 technique for continously varying data.</p>
 <p>The <code class="docutils literal"><span class="pre">query</span></code> method takes a deadline, which is a point in time the requester is willing to wait until for the necessary
 data to be available.  Not every oracle will need this.  This can be useful where data is expected to be available on a
 particular schedule and we use scheduling functionality to automatically launch the processing associated with it.
 We can schedule for the expected announcement (or publish) time and give a suitable deadline at which the lack of the
 information being available and the delay to processing becomes significant and may need to be escalated.</p>
 </div>
 <div class="section" id="hiding-transaction-data-from-the-oracle">
 <h2>Hiding transaction data from the oracle<a class="headerlink" href="#hiding-transaction-data-from-the-oracle" title="Permalink to this headline">¶</a></h2>
 <p>Because the transaction is sent to the oracle for signing, ordinarily the oracle would be able to see the entire contents
 of that transaction including the inputs, output contract states and all the commands, not just the one (in this case)
 relevant command.  This is an obvious privacy leak for the other participants.  We currently solve this with
 <code class="docutils literal"><span class="pre">FilteredTransaction</span></code>-s and the use of Merkle Trees.  These reveal only the necessary parts of the transaction to the
 oracle but still allow it to sign it by providing the Merkle hashes for the remaining parts.  See <a class="reference internal" href="merkle-trees.html"><span class="doc">Transaction tear-offs</span></a> for
 more details.</p>
 </div>
 <div class="section" id="pay-per-play-oracles">
 <h2>Pay-per-play oracles<a class="headerlink" href="#pay-per-play-oracles" title="Permalink to this headline">¶</a></h2>
@ -316,6 +351,236 @@ would be conclusive evidence of intent to disobey the rules of the service (<em>
 where parties are legally identifiable, usage of such a contract would by itself be sufficient to trigger some sort of
 punishment.</p>
 </div>
 </div>
 <div class="section" id="implementing-an-oracle-with-continuously-varying-data">
 <h1>Implementing an oracle with continuously varying data<a class="headerlink" href="#implementing-an-oracle-with-continuously-varying-data" title="Permalink to this headline">¶</a></h1>
 <div class="section" id="implement-the-core-classes">
 <h2>Implement the core classes<a class="headerlink" href="#implement-the-core-classes" title="Permalink to this headline">¶</a></h2>
 <p>The key is to implement your oracle in a similar way to the <code class="docutils literal"><span class="pre">NodeInterestRates.Oracle</span></code> outline we gave above with
 both <code class="docutils literal"><span class="pre">query</span></code> and <code class="docutils literal"><span class="pre">sign</span></code> methods.  Typically you would want one class that encapsulates the parameters to the <code class="docutils literal"><span class="pre">query</span></code>
 method (<code class="docutils literal"><span class="pre">FixOf</span></code> above), and a <code class="docutils literal"><span class="pre">CommandData</span></code> implementation (<code class="docutils literal"><span class="pre">Fix</span></code> above) that encapsulates both an instance of
 that parameter class and an instance of whatever the result of the <code class="docutils literal"><span class="pre">query</span></code> is (<code class="docutils literal"><span class="pre">BigDecimal</span></code> above).</p>
 <p>The <code class="docutils literal"><span class="pre">NodeInterestRates.Oracle</span></code> allows querying for multiple <code class="docutils literal"><span class="pre">Fix</span></code>-es but that is not necessary and is
 provided for the convenience of callers who might need multiple and can do it all in one query request.  Likewise
 the <em>deadline</em> functionality is optional and can be avoided initially.</p>
 <p>Let&#8217;s see what parameters we pass to the constructor of this oracle.</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">Oracle</span><span class="p">(</span><span class="k">val</span> <span class="py">identity</span><span class="p">:</span> <span class="n">Party</span><span class="p">,</span> <span class="k">private</span> <span class="k">val</span> <span class="py">signingKey</span><span class="p">:</span> <span class="n">KeyPair</span><span class="p">,</span> <span class="k">val</span> <span class="py">clock</span><span class="p">:</span> <span class="n">Clock</span><span class="p">)</span> <span class="p">=</span> <span class="n">TODO</span><span class="p">()</span>
 </pre></div>
 </div>
 <p>Here we see the oracle needs to have its own identity, so it can check which transaction commands it is expected to
 sign for, and also needs a pair of signing keys with which it signs transactions.  The clock is used for the deadline
 functionality which we will not discuss further here.</p>
 <p>Assuming you have a data source and can query it, it should be very easy to implement your <code class="docutils literal"><span class="pre">query</span></code> method and the
 parameter and <code class="docutils literal"><span class="pre">CommandData</span></code> classes.</p>
 <p>Let&#8217;s see how the <code class="docutils literal"><span class="pre">sign</span></code> method for <code class="docutils literal"><span class="pre">NodeInterestRates.Oracle</span></code> is written:</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span>        <span class="k">fun</span> <span class="nf">sign</span><span class="p">(</span><span class="n">ftx</span><span class="p">:</span> <span class="n">FilteredTransaction</span><span class="p">,</span> <span class="n">merkleRoot</span><span class="p">:</span> <span class="n">SecureHash</span><span class="p">):</span> <span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span> <span class="p">{</span>
            <span class="k">if</span> <span class="p">(!</span><span class="n">ftx</span><span class="p">.</span><span class="n">verify</span><span class="p">(</span><span class="n">merkleRoot</span><span class="p">)){</span>
                <span class="k">throw</span> <span class="n">MerkleTreeException</span><span class="p">(</span><span class="s">&quot;Rate Fix Oracle: Couldn&#39;t verify partial Merkle tree.&quot;</span><span class="p">)</span>
            <span class="p">}</span>
            <span class="c1">// Reject if we have something different than only commands.</span>
            <span class="k">val</span> <span class="py">leaves</span> <span class="p">=</span> <span class="n">ftx</span><span class="p">.</span><span class="n">filteredLeaves</span>
            <span class="n">require</span><span class="p">(</span><span class="n">leaves</span><span class="p">.</span><span class="n">inputs</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">&amp;&amp;</span> <span class="n">leaves</span><span class="p">.</span><span class="n">outputs</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">&amp;&amp;</span> <span class="n">leaves</span><span class="p">.</span><span class="n">attachments</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span>
            <span class="k">val</span> <span class="py">fixes</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">Fix</span><span class="p">&gt;</span> <span class="p">=</span> <span class="n">ftx</span><span class="p">.</span><span class="n">filteredLeaves</span><span class="p">.</span><span class="n">commands</span><span class="p">.</span>
                    <span class="n">filter</span> <span class="p">{</span> <span class="n">identity</span><span class="p">.</span><span class="n">owningKey</span> <span class="k">in</span> <span class="n">it</span><span class="p">.</span><span class="n">signers</span> <span class="p">&amp;&amp;</span> <span class="n">it</span><span class="p">.</span><span class="n">value</span> <span class="k">is</span> <span class="n">Fix</span> <span class="p">}.</span>
                    <span class="n">map</span> <span class="p">{</span> <span class="n">it</span><span class="p">.</span><span class="n">value</span> <span class="k">as</span> <span class="n">Fix</span> <span class="p">}</span>
            <span class="c1">// Reject signing attempt if we received more commands than we should.</span>
            <span class="k">if</span> <span class="p">(</span><span class="n">fixes</span><span class="p">.</span><span class="n">size</span> <span class="p">!=</span> <span class="n">ftx</span><span class="p">.</span><span class="n">filteredLeaves</span><span class="p">.</span><span class="n">commands</span><span class="p">.</span><span class="n">size</span><span class="p">)</span>
                <span class="k">throw</span> <span class="n">IllegalArgumentException</span><span class="p">()</span>
            <span class="c1">// Reject this signing attempt if there are no commands of the right kind.</span>
            <span class="k">if</span> <span class="p">(</span><span class="n">fixes</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span>
                <span class="k">throw</span> <span class="n">IllegalArgumentException</span><span class="p">()</span>
            <span class="c1">// For each fix, verify that the data is correct.</span>
            <span class="k">val</span> <span class="py">knownFixes</span> <span class="p">=</span> <span class="n">knownFixes</span> <span class="c1">// Snapshot</span>
            <span class="k">for</span> <span class="p">(</span><span class="n">fix</span> <span class="k">in</span> <span class="n">fixes</span><span class="p">)</span> <span class="p">{</span>
                <span class="k">val</span> <span class="py">known</span> <span class="p">=</span> <span class="n">knownFixes</span><span class="p">[</span><span class="n">fix</span><span class="p">.</span><span class="n">of</span><span class="p">]</span>
                <span class="k">if</span> <span class="p">(</span><span class="n">known</span> <span class="p">==</span> <span class="k">null</span> <span class="p">||</span> <span class="n">known</span> <span class="p">!=</span> <span class="n">fix</span><span class="p">)</span>
                    <span class="k">throw</span> <span class="n">UnknownFix</span><span class="p">(</span><span class="n">fix</span><span class="p">.</span><span class="n">of</span><span class="p">)</span>
            <span class="p">}</span>
            <span class="c1">// It all checks out, so we can return a signature.</span>
            <span class="c1">//</span>
            <span class="c1">// Note that we will happily sign an invalid transaction, as we are only being presented with a filtered</span>
            <span class="c1">// version so we can&#39;t resolve or check it ourselves. However, that doesn&#39;t matter much, as if we sign</span>
            <span class="c1">// an invalid transaction the signature is worthless.</span>
            <span class="k">return</span> <span class="n">signingKey</span><span class="p">.</span><span class="n">signWithECDSA</span><span class="p">(</span><span class="n">merkleRoot</span><span class="p">.</span><span class="n">bytes</span><span class="p">,</span> <span class="n">identity</span><span class="p">)</span>
        <span class="p">}</span>
 </pre></div>
 </div>
 <p>Here we can see that there are several steps:</p>
 <ol class="arabic simple">
 <li>Ensure that the transaction we have been sent is indeed valid and passes verification, even though we cannot see all
 of it.</li>
 <li>Check that we only received commands as expected, and each of those commands expects us to sign for them and is of
 the expected type (<code class="docutils literal"><span class="pre">Fix</span></code> here).</li>
 <li>Iterate over each of the commands we identified in the last step and check that the data they represent matches
 exactly our data source.  The final step, assuming we have got this far, is to generate a signature for the
 transaction and return it.</li>
 </ol>
 </div>
 <div class="section" id="binding-to-the-network-via-cordapp-plugin">
 <h2>Binding to the network via CorDapp plugin<a class="headerlink" href="#binding-to-the-network-via-cordapp-plugin" title="Permalink to this headline">¶</a></h2>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last">Before reading any further, we advise that you understand the concept of flows and how to write them and use
 them. See <a class="reference internal" href="flow-state-machines.html"><span class="doc">Writing flows</span></a>.  Likewise some understanding of Cordapps, plugins and services will be helpful.
 See <a class="reference internal" href="creating-a-cordapp.html"><span class="doc">CorDapps Background</span></a>.</p>
 </div>
 <p>The first step is to create a service to host the oracle on the network.  Let&#8217;s see how that&#8217;s implemented:</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span>    class Service(val services: PluginServiceHub) : AcceptsFileUpload, SingletonSerializeAsToken() {
        val oracle: Oracle by lazy {
            val myNodeInfo = services.myInfo
            val myIdentity = myNodeInfo.serviceIdentities(type).first()
            val mySigningKey = services.keyManagementService.toKeyPair(myIdentity.owningKey.keys)
            Oracle(myIdentity, mySigningKey, services.clock)
        }
        init {
            // Note: access to the singleton oracle property is via the registered SingletonSerializeAsToken Service.
            // Otherwise the Kryo serialisation of the call stack in the Quasar Fiber extends to include
            // the framework Oracle and the flow will crash.
            services.registerFlowInitiator(RatesFixFlow.FixSignFlow::class) { FixSignHandler(it, this) }
            services.registerFlowInitiator(RatesFixFlow.FixQueryFlow::class) { FixQueryHandler(it, this) }
        }
        private class FixSignHandler(val otherParty: Party, val service: Service) : FlowLogic&lt;Unit&gt;() {
            @Suspendable
            override fun call() {
                val request = receive&lt;RatesFixFlow.SignRequest&gt;(otherParty).unwrap { it }
                send(otherParty, service.oracle.sign(request.ftx, request.rootHash))
            }
        }
        private class FixQueryHandler(val otherParty: Party, val service: Service) : FlowLogic&lt;Unit&gt;() {
            companion object {
                object RECEIVED : ProgressTracker.Step(&quot;Received fix request&quot;)
                object SENDING : ProgressTracker.Step(&quot;Sending fix response&quot;)
            }
            override val progressTracker = ProgressTracker(RECEIVED, SENDING)
            init {
                progressTracker.currentStep = RECEIVED
            }
            @Suspendable
            override fun call(): Unit {
                val request = receive&lt;RatesFixFlow.QueryRequest&gt;(otherParty).unwrap { it }
                val answers = service.oracle.query(request.queries, request.deadline)
                progressTracker.currentStep = SENDING
                send(otherParty, answers)
            }
        }
 </pre></div>
 </div>
 <p>This may look complicated, but really it&#8217;s made up of some relatively simple elements (in the order they appear in the code):</p>
 <ol class="arabic simple">
 <li>Accept a <code class="docutils literal"><span class="pre">PluginServiceHub</span></code> in the constructor.  This is your interface to the Corda node.</li>
 <li>Ensure you extend the abstract class <code class="docutils literal"><span class="pre">SingletonSerializeAsToken</span></code> (see <a class="reference internal" href="corda-plugins.html"><span class="doc">The Corda plugin framework</span></a>).</li>
 <li>Create an instance of your core oracle class that has the <code class="docutils literal"><span class="pre">query</span></code> and <code class="docutils literal"><span class="pre">sign</span></code> methods as discussed above.</li>
 <li>Register your client sub-flows (in this case both in <code class="docutils literal"><span class="pre">RatesFixFlow</span></code>.  See the next section) for querying and
 signing as initiating your service flows that actually do the querying and signing using your core oracle class instance.</li>
 <li>Implement your service flows that call your core oracle class instance.</li>
 </ol>
 <p>The final step is to register your service with the node via the plugin mechanism. Do this by
 implementing a plugin.  Don&#8217;t forget the resources file to register it with the <code class="docutils literal"><span class="pre">ServiceLoader</span></code> framework
 (see <a class="reference internal" href="corda-plugins.html"><span class="doc">The Corda plugin framework</span></a>).</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">Plugin</span> <span class="p">:</span> <span class="n">CordaPluginRegistry</span><span class="p">()</span> <span class="p">{</span>
     <span class="k">override</span> <span class="k">val</span> <span class="py">servicePlugins</span><span class="p">:</span> <span class="n">List</span><span class="p">&lt;</span><span class="n">Class</span><span class="p">&lt;*&gt;&gt;</span> <span class="p">=</span> <span class="n">listOf</span><span class="p">(</span><span class="n">Service</span><span class="o">::</span><span class="k">class</span><span class="p">.</span><span class="n">java</span><span class="p">)</span>
 <span class="p">}</span>
 </pre></div>
 </div>
 </div>
 <div class="section" id="providing-client-sub-flows-for-querying-and-signing">
 <h2>Providing client sub-flows for querying and signing<a class="headerlink" href="#providing-client-sub-flows-for-querying-and-signing" title="Permalink to this headline">¶</a></h2>
 <p>We mentioned the client sub-flow briefly above.  They are the mechanism that clients, in the form of other flows, will
 interact with your oracle.  Typically there will be one for querying and one for signing.  Let&#8217;s take a look at
 those for <code class="docutils literal"><span class="pre">NodeInterestRates.Oracle</span></code>.</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span>    <span class="k">class</span> <span class="nc">FixQueryFlow</span><span class="p">(</span><span class="k">val</span> <span class="py">fixOf</span><span class="p">:</span> <span class="n">FixOf</span><span class="p">,</span> <span class="k">val</span> <span class="py">oracle</span><span class="p">:</span> <span class="n">Party</span><span class="p">)</span> <span class="p">:</span> <span class="n">FlowLogic</span><span class="p">&lt;</span><span class="n">Fix</span><span class="p">&gt;()</span> <span class="p">{</span>
        <span class="n">@Suspendable</span>
        <span class="k">override</span> <span class="k">fun</span> <span class="nf">call</span><span class="p">():</span> <span class="n">Fix</span> <span class="p">{</span>
            <span class="k">val</span> <span class="py">deadline</span> <span class="p">=</span> <span class="n">suggestInterestRateAnnouncementTimeWindow</span><span class="p">(</span><span class="n">fixOf</span><span class="p">.</span><span class="n">name</span><span class="p">,</span> <span class="n">oracle</span><span class="p">.</span><span class="n">name</span><span class="p">,</span> <span class="n">fixOf</span><span class="p">.</span><span class="n">forDay</span><span class="p">).</span><span class="n">end</span>
            <span class="c1">// TODO: add deadline to receive</span>
            <span class="k">val</span> <span class="py">resp</span> <span class="p">=</span> <span class="n">sendAndReceive</span><span class="p">&lt;</span><span class="n">ArrayList</span><span class="p">&lt;</span><span class="n">Fix</span><span class="p">&gt;&gt;(</span><span class="n">oracle</span><span class="p">,</span> <span class="n">QueryRequest</span><span class="p">(</span><span class="n">listOf</span><span class="p">(</span><span class="n">fixOf</span><span class="p">),</span> <span class="n">deadline</span><span class="p">))</span>
            <span class="k">return</span> <span class="n">resp</span><span class="p">.</span><span class="n">unwrap</span> <span class="p">{</span>
                <span class="k">val</span> <span class="py">fix</span> <span class="p">=</span> <span class="n">it</span><span class="p">.</span><span class="n">first</span><span class="p">()</span>
                <span class="c1">// Check the returned fix is for what we asked for.</span>
                <span class="n">check</span><span class="p">(</span><span class="n">fix</span><span class="p">.</span><span class="n">of</span> <span class="p">==</span> <span class="n">fixOf</span><span class="p">)</span>
                <span class="n">fix</span>
            <span class="p">}</span>
        <span class="p">}</span>
    <span class="p">}</span>
    <span class="k">class</span> <span class="nc">FixSignFlow</span><span class="p">(</span><span class="k">val</span> <span class="py">tx</span><span class="p">:</span> <span class="n">TransactionBuilder</span><span class="p">,</span> <span class="k">val</span> <span class="py">oracle</span><span class="p">:</span> <span class="n">Party</span><span class="p">,</span> <span class="k">val</span> <span class="py">filterFuns</span><span class="p">:</span> <span class="n">FilterFuns</span><span class="p">)</span> <span class="p">:</span> <span class="n">FlowLogic</span><span class="p">&lt;</span><span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span><span class="p">&gt;()</span> <span class="p">{</span>
        <span class="n">@Suspendable</span>
        <span class="k">override</span> <span class="k">fun</span> <span class="nf">call</span><span class="p">():</span> <span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span> <span class="p">{</span>
            <span class="k">val</span> <span class="py">wtx</span> <span class="p">=</span> <span class="n">tx</span><span class="p">.</span><span class="n">toWireTransaction</span><span class="p">()</span>
            <span class="k">val</span> <span class="py">partialMerkleTx</span> <span class="p">=</span> <span class="n">FilteredTransaction</span><span class="p">.</span><span class="n">buildMerkleTransaction</span><span class="p">(</span><span class="n">wtx</span><span class="p">,</span> <span class="n">filterFuns</span><span class="p">)</span>
            <span class="k">val</span> <span class="py">rootHash</span> <span class="p">=</span> <span class="n">wtx</span><span class="p">.</span><span class="n">id</span>
            <span class="k">val</span> <span class="py">resp</span> <span class="p">=</span> <span class="n">sendAndReceive</span><span class="p">&lt;</span><span class="n">DigitalSignature</span><span class="p">.</span><span class="n">LegallyIdentifiable</span><span class="p">&gt;(</span><span class="n">oracle</span><span class="p">,</span> <span class="n">SignRequest</span><span class="p">(</span><span class="n">rootHash</span><span class="p">,</span> <span class="n">partialMerkleTx</span><span class="p">))</span>
            <span class="k">return</span> <span class="n">resp</span><span class="p">.</span><span class="n">unwrap</span> <span class="p">{</span> <span class="n">sig</span> <span class="p">-&gt;</span>
                <span class="n">check</span><span class="p">(</span><span class="n">sig</span><span class="p">.</span><span class="n">signer</span> <span class="p">==</span> <span class="n">oracle</span><span class="p">)</span>
                <span class="n">tx</span><span class="p">.</span><span class="n">checkSignature</span><span class="p">(</span><span class="n">sig</span><span class="p">)</span>
                <span class="n">sig</span>
            <span class="p">}</span>
        <span class="p">}</span>
    <span class="p">}</span>
 </pre></div>
 </div>
 <p>You&#8217;ll note that the <code class="docutils literal"><span class="pre">FixSignFlow</span></code> requires a <code class="docutils literal"><span class="pre">FilterFuns</span></code> instance with the appropriate filter to include only
 the <code class="docutils literal"><span class="pre">Fix</span></code> commands.  You can find a further explanation of this in <a class="reference internal" href="merkle-trees.html"><span class="doc">Transaction tear-offs</span></a>.</p>
 </div>
 </div>
 <div class="section" id="using-an-oracle">
 <h1>Using an oracle<a class="headerlink" href="#using-an-oracle" title="Permalink to this headline">¶</a></h1>
 <p>The oracle is invoked through sub-flows to query for values, add them to the transaction as commands and then get
 the transaction signed by the the oracle.  Following on from the above examples, this is all encapsulated in a sub-flow
 called <code class="docutils literal"><span class="pre">RatesFixFlow</span></code>.  Here&#8217;s the <code class="docutils literal"><span class="pre">call</span></code> method of that flow.</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span>    <span class="n">@Suspendable</span>
    <span class="k">override</span> <span class="k">fun</span> <span class="nf">call</span><span class="p">()</span> <span class="p">{</span>
        <span class="n">progressTracker</span><span class="p">.</span><span class="n">currentStep</span> <span class="p">=</span> <span class="n">progressTracker</span><span class="p">.</span><span class="n">steps</span><span class="p">[</span><span class="m">1</span><span class="p">]</span>
        <span class="k">val</span> <span class="py">fix</span> <span class="p">=</span> <span class="n">subFlow</span><span class="p">(</span><span class="n">FixQueryFlow</span><span class="p">(</span><span class="n">fixOf</span><span class="p">,</span> <span class="n">oracle</span><span class="p">))</span>
        <span class="n">progressTracker</span><span class="p">.</span><span class="n">currentStep</span> <span class="p">=</span> <span class="n">WORKING</span>
        <span class="n">checkFixIsNearExpected</span><span class="p">(</span><span class="n">fix</span><span class="p">)</span>
        <span class="n">tx</span><span class="p">.</span><span class="n">addCommand</span><span class="p">(</span><span class="n">fix</span><span class="p">,</span> <span class="n">oracle</span><span class="p">.</span><span class="n">owningKey</span><span class="p">)</span>
        <span class="n">beforeSigning</span><span class="p">(</span><span class="n">fix</span><span class="p">)</span>
        <span class="n">progressTracker</span><span class="p">.</span><span class="n">currentStep</span> <span class="p">=</span> <span class="n">SIGNING</span>
        <span class="k">val</span> <span class="py">signature</span> <span class="p">=</span> <span class="n">subFlow</span><span class="p">(</span><span class="n">FixSignFlow</span><span class="p">(</span><span class="n">tx</span><span class="p">,</span> <span class="n">oracle</span><span class="p">,</span> <span class="n">filterFuns</span><span class="p">))</span>
        <span class="n">tx</span><span class="p">.</span><span class="n">addSignatureUnchecked</span><span class="p">(</span><span class="n">signature</span><span class="p">)</span>
    <span class="p">}</span>
 </pre></div>
 </div>
 <p>As you can see, this:</p>
 <ol class="arabic simple">
 <li>Queries the oracle for the fact using the client sub-flow for querying from above.</li>
 <li>Does some quick validation.</li>
 <li>Adds the command to the transaction containing the fact to be signed for by the oracle.</li>
 <li>Calls an extension point that allows clients to generate output states based on the fact from the oracle.</li>
 <li>Requests the signature from the oracle using the client sub-flow for signing from above.</li>
 <li>Adds the signature returned from the oracle.</li>
 </ol>
 <p>Here&#8217;s an example of it in action from <code class="docutils literal"><span class="pre">FixingFlow.Fixer</span></code>.</p>
 <div class="highlight-kotlin"><div class="highlight"><pre><span></span>            fun filterCommands(c: Command) = oracleParty.owningKey in c.signers &amp;&amp; c.value is Fix
            val filterFuns = FilterFuns(filterCommands = ::filterCommands)
            val addFixing = object : RatesFixFlow(ptx, filterFuns, oracleParty, fixOf, BigDecimal.ZERO, BigDecimal.ONE) {
                @Suspendable
                override fun beforeSigning(fix: Fix) {
                    newDeal.generateFix(ptx, StateAndRef(txState, handshake.payload.ref), fix)
                    // And add a request for timestamping: it may be that none of the contracts need this! But it can&#39;t hurt
                    // to have one.
                    ptx.setTime(serviceHub.clock.instant(), 30.seconds)
                }
            }
            subFlow(addFixing)
 </pre></div>
 </div>
 </div>
@ -328,7 +593,7 @@ punishment.</p>
        <a href="tutorial-attachments.html" class="btn btn-neutral float-right" title="Using attachments" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="flow-state-machines.html" class="btn btn-neutral" title="Flow state machines" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="using-a-notary.html" class="btn btn-neutral" title="Using a notary service" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -337,7 +602,7 @@ punishment.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/permissioning.html
+++ b/docs/build/html/permissioning.html
@ -31,7 +31,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Creating a CorDapp" href="creating-a-cordapp.html"/>
+        <link rel="next" title="Writing a contract" href="tutorial-contract.html"/>
        <link rel="prev" title="Node Explorer" href="node-explorer.html"/> 
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -115,23 +127,21 @@
 </ul>
 </li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -148,6 +158,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -281,7 +293,7 @@ You can also specify the location of <code class="docutils literal"><span class=
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="creating-a-cordapp.html" class="btn btn-neutral float-right" title="Creating a CorDapp" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="tutorial-contract.html" class="btn btn-neutral float-right" title="Writing a contract" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="node-explorer.html" class="btn btn-neutral" title="Node Explorer" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@ -293,7 +305,7 @@ You can also specify the location of <code class="docutils literal"><span class=
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/persistence.html
+++ b/docs/build/html/persistence.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul class="current">
@ -114,23 +126,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -147,6 +157,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -388,7 +400,7 @@ to initialise the ORM layer.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/release-notes.html
+++ b/docs/build/html/release-notes.html
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,44 +116,50 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<ul>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
-<li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Flow state machines</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Release notes</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#milestone-6">Milestone 6</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#milestone-5">Milestone 5</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#milestone-4">Milestone 4</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#milestone-3">Milestone 3</a></li>
@ -203,6 +221,87 @@
  <div class="section" id="release-notes">
 <h1>Release notes<a class="headerlink" href="#release-notes" title="Permalink to this headline">¶</a></h1>
 <p>Here are brief summaries of what&#8217;s changed between each snapshot release.</p>
 <div class="section" id="milestone-6">
 <h2>Milestone 6<a class="headerlink" href="#milestone-6" title="Permalink to this headline">¶</a></h2>
 <ul>
 <li><p class="first">Added the <a class="reference external" href="_static/corda-technical-whitepaper.pdf">Corda technical white paper</a>. Note that its current version
 is 0.5 to reflect the fact that the Corda design is still evolving. Although we expect only relatively small tweaks
 at this point, when Corda reaches 1.0 so will the white paper.</p>
 </li>
 <li><p class="first">Major documentation restructuring and new content:</p>
 <blockquote>
 <div><ul class="simple">
 <li>More details on Corda node internals.</li>
 <li>New CorDapp tutorial.</li>
 <li>New tutorial on building transactions.</li>
 <li>New tutorials on how to run and use a notary service.</li>
 </ul>
 </div></blockquote>
 </li>
 <li><p class="first">An experimental version of the deterministic JVM sandbox has been added. It is not integrated with the node and will
 undergo some significant changes in the coming releases before it is integrated, as the code is finished, as bugs are
 found and fixed, and as the platform subset we choose to expose is finalised. Treat this as an outline of the basic
 approach rather than something usable for production.</p>
 </li>
 <li><p class="first">Developer experience:</p>
 <blockquote>
 <div><ul class="simple">
 <li>Samples have been merged back into the main repository. All samples can now be run via command line or IntelliJ.</li>
 <li>Added a Client RPC python example.</li>
 <li>Node console output now displays concise startup information, such as startup time or web address. All logging to
 the console is suppressed apart from errors and flow progress tracker steps. It can be re-enabled by passing
 <code class="docutils literal"><span class="pre">--log-to-console</span></code> command line parameter. Note that the log file remains unchanged an will still contain all
 log entries.</li>
 <li>The <code class="docutils literal"><span class="pre">runnodes</span></code> scripts generated by the Gradle plugins now open each node in separate terminal windows or (on macOS) tabs.</li>
 <li>A much more complete template app.</li>
 <li>JARs now available on Maven Central.</li>
 </ul>
 </div></blockquote>
 </li>
 <li><p class="first">Data model: A party is now identified by a composite key (formerly known as a &#8220;public key tree&#8221;) instead of a single public key.
 Read more in <a class="reference internal" href="transaction-data-types.html#composite-keys"><span class="std std-ref">Multi-signature support</span></a>. This allows expressing distributed service identities, e.g. a distributed notary.
 In the future this will also allow parties to use multiple signing keys for their legal identity.</p>
 </li>
 <li><p class="first">Decentralised consensus: A prototype RAFT based notary composed of multiple nodes has been added. This implementation
 is optimised for high performance over robustness against malicious cluster members, which may be appropriate for
 some financial situations. See <a class="reference internal" href="running-the-demos.html#notary-demo"><span class="std std-ref">Distributed Notary demo</span></a> to try it out. A BFT notary will be added later.</p>
 </li>
 <li><p class="first">Node explorer app:</p>
 <blockquote>
 <div><ul class="simple">
 <li>New theme aligned with the Corda branding.</li>
 <li>The New Transaction screen moved to the Cash View (as it is used solely for cash transactions)</li>
 <li>Removed state machine/flow information from Transaction table. A new view for this will be created in a future release.</li>
 <li>Added a new Network View that displays details of all nodes on the network.</li>
 <li>Users can now configure the reporting currency in settings.</li>
 <li>Various layout and performance enhancements.</li>
 </ul>
 </div></blockquote>
 </li>
 <li><p class="first">Client RPC:</p>
 <blockquote>
 <div><ul class="simple">
 <li>Added a generic <code class="docutils literal"><span class="pre">startFlow</span></code> method that enables starting of any flow, given sufficient permissions.</li>
 <li>Added the ability for plugins to register additional classes or custom serialisers with Kryo for use in RPC.</li>
 <li><code class="docutils literal"><span class="pre">rpc-users.properties</span></code> file has been removed with RPC user settings moved to the config file.</li>
 </ul>
 </div></blockquote>
 </li>
 <li><p class="first">Configuration changes: It is now possible to specify a custom legal name for any of the node&#8217;s advertised services.</p>
 </li>
 <li><p class="first">Added a load testing framework which allows stress testing of a node cluster, as well as specifying different ways of
 disrupting the normal operation of nodes. See <a class="reference internal" href="loadtesting.html"><span class="doc">Load testing</span></a>.</p>
 </li>
 <li><p class="first">Improvements to the experimental contract DSL, by Sofus Mortensen of Nordea Bank (please give Nordea a shoutout too).</p>
 </li>
 </ul>
 <p>API changes:</p>
 <ul class="simple">
 <li>The top level package has been renamed from <code class="docutils literal"><span class="pre">com.r3corda</span></code> to <code class="docutils literal"><span class="pre">net.corda</span></code>.</li>
 <li>Protocols have been renamed to &#8220;flows&#8221;.</li>
 <li><code class="docutils literal"><span class="pre">OpaqueBytes</span></code> now uses <code class="docutils literal"><span class="pre">bytes</span></code> as the field name rather than <code class="docutils literal"><span class="pre">bits</span></code>.</li>
 </ul>
 </div>
 <div class="section" id="milestone-5">
 <h2>Milestone 5<a class="headerlink" href="#milestone-5" title="Permalink to this headline">¶</a></h2>
 <ul>
@ -325,7 +424,7 @@ not currently running a permissioning service.</li>
 <blockquote>
 <div><ul class="simple">
 <li>The Corda libraries that app developers need to link against can now be installed into your local Maven
-repository, where they can then be used like any other JAR. See <a class="reference internal" href="creating-a-cordapp.html"><span class="doc">Creating a Cordapp</span></a>.</li>
+repository, where they can then be used like any other JAR. See <a class="reference internal" href="creating-a-cordapp.html"><span class="doc">CorDapps Background</span></a>.</li>
 </ul>
 </div></blockquote>
 </li>
@ -494,7 +593,7 @@ in the upcoming releases.</li>
 <p>New documentation:</p>
 <ul class="simple">
 <li><a class="reference internal" href="contract-catalogue.html"><span class="doc">Contract catalogue</span></a></li>
-<li><a class="reference internal" href="contract-irs.html"><span class="doc">Interest Rate Swaps</span></a></li>
+<li><a class="reference internal" href="contract-irs.html"><span class="doc">Interest rate swaps</span></a></li>
 <li><a class="reference internal" href="tutorial-test-dsl.html"><span class="doc">Writing a contract test</span></a></li>
 </ul>
 </div>
@ -621,7 +720,7 @@ the custom function forces the use of non-blocking random drivers on Linux.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/release-process.html
+++ b/docs/build/html/release-process.html
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,40 +116,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<ul>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
-<li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Flow state machines</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -253,7 +270,7 @@ Minor changes to the branch don&#8217;t have to be announced unless it&#8217;d b
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/running-a-notary.html
+++ b/docs/build/html/running-a-notary.html
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -97,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -110,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -143,6 +153,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -241,7 +253,7 @@ purposes. There is work in progress to simplify it. To see it in action, however
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/running-the-demos.html
+++ b/docs/build/html/running-the-demos.html
@ -31,8 +31,8 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Data model" href="data-model.html"/>
+        <link rel="next" title="CLI vs IDE" href="CLI-vs-IDE.html"/>
-        <link rel="prev" title="Getting set up" href="getting-set-up.html"/> 
+        <link rel="prev" title="Getting Set Up : Faultfinding" href="getting-set-up-fault-finding.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,21 +89,39 @@
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Running the demos</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#important-common-instructions-for-all-demos">Important : Common Instructions for all demos</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#trader-demo">Trader demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#irs-demo">IRS demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#attachment-demo">Attachment demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#simm-and-portfolio-demo">SIMM and Portfolio demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#distributed-notary-demo">Distributed Notary demo</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#simm-and-portfolio-demo-aka-the-initial-margin-agreement-demo">SIMM and Portfolio Demo - aka the Initial Margin Agreement Demo</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#background-and-simm-introduction">Background and SIMM Introduction</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#what-happens-in-the-demo-notionally">What happens in the demo (notionally)</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#demo-execution-step-by-step">Demo execution (step by step)</a></li>
 </ul>
 </li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -117,23 +135,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -150,6 +166,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -223,13 +241,17 @@ using the Standard Initial Margin Model.</li>
 <p class="first admonition-title">Note</p>
 <p class="last">If any demos don&#8217;t work please jump on our mailing list and let us know.</p>
 </div>
 <div class="section" id="important-common-instructions-for-all-demos">
 <h2>Important : Common Instructions for all demos<a class="headerlink" href="#important-common-instructions-for-all-demos" title="Permalink to this headline">¶</a></h2>
 <p>The demos can be run either from the command line, or from inside IntelliJ. Running from the command line is
 recommended if you are just wanting to see them run, using IntelliJ can be helpful if you want to debug or
-develop the demos themselves.</p>
+develop the demos themselves. For more details about running via the command line or within IntelliJ - see <a class="reference internal" href="CLI-vs-IDE.html"><span class="doc">CLI vs IDE</span></a>.</p>
 <p><em>For all demos:</em> The <code class="docutils literal"><span class="pre">install</span></code> gradle task is automatically ran if required; this no longer needs to be run independently.</p>
 </div>
 <div class="section" id="trader-demo">
 <h2>Trader demo<a class="headerlink" href="#trader-demo" title="Permalink to this headline">¶</a></h2>
 <p>This demo brings up three nodes: Bank A, Bank B and a notary/network map node that they both use. Bank A will
-be the buyer, and self-issues some cash in order to acquire the commercial paper from Bank B, the seller.</p>
+be the buyer, and self-issues some cash in order to acquire commercial paper from Bank B, the seller.</p>
 <p>To run from the command line:</p>
 <ol class="arabic simple">
 <li>Run <code class="docutils literal"><span class="pre">./gradlew</span> <span class="pre">samples:trader-demo:deployNodes</span></code> to create a set of configs and installs under <code class="docutils literal"><span class="pre">samples/trader-demo/build/nodes</span></code></li>
@ -256,7 +278,7 @@ oracle together. The two banks agree on an interest rate swap, and then do regul
 on a simulated clock passes.</p>
 <p>To run from the command line:</p>
 <ol class="arabic simple">
-<li>Run <code class="docutils literal"><span class="pre">./gradlew</span> <span class="pre">samples:irs-demo:deployNodes</span> <span class="pre">samples:irs-demo:installDist</span></code> to install configs and a command line tool under <code class="docutils literal"><span class="pre">samples/irs-demo/build</span></code>.</li>
+<li>Run <code class="docutils literal"><span class="pre">./gradlew</span> <span class="pre">samples:irs-demo:deployNodes</span></code> to install configs and a command line tool under <code class="docutils literal"><span class="pre">samples/irs-demo/build</span></code>.</li>
 <li>Change to the <code class="docutils literal"><span class="pre">samples/irs-demo/build</span></code> directory.</li>
 <li>Run <code class="docutils literal"><span class="pre">./nodes/runnodes</span></code> (or <code class="docutils literal"><span class="pre">runnodes.bat</span></code> on Windows) to open up three new terminals with the three nodes.</li>
 <li>Run <code class="docutils literal"><span class="pre">./install/irs-demo/bin/irs-demo</span> <span class="pre">--role</span> <span class="pre">UploadRates</span></code> (or use <code class="docutils literal"><span class="pre">irs-demo.bat</span></code> on Windows). You should see a
@ -303,20 +325,6 @@ Now look at the other windows to see the output of the demo.</li>
 <p>In the &#8220;Attachment Demo: Run Nodes&#8221; window you should see some log lines scroll past, and within a few seconds the
 message &#8220;File received - we&#8217;re happy!&#8221; should be printed.</p>
 </div>
 <div class="section" id="simm-and-portfolio-demo">
 <h2>SIMM and Portfolio demo<a class="headerlink" href="#simm-and-portfolio-demo" title="Permalink to this headline">¶</a></h2>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last">Read more about this demo at <a class="reference internal" href="initial-margin-agreement.html"><span class="doc">Initial margin agreements</span></a>.</p>
 </div>
 <p>To run the demo run:</p>
 <ol class="arabic simple">
 <li>Open the Corda project in IntelliJ and run the &#8220;Install&#8221; configuration</li>
 <li>Open the Corda samples project in IntelliJ and run the &#8220;Simm Valuation Demo&#8221; configuration</li>
 </ol>
 <p>Now open <a class="reference external" href="http://localhost:10005/web/simmvaluationdemo">http://localhost:10005/web/simmvaluationdemo</a> and <a class="reference external" href="http://localhost:10007/web/simmvaluationdemo">http://localhost:10007/web/simmvaluationdemo</a> to view the two nodes that this
 will have started respectively. You can now use the demo by creating trades and agreeing the valuations.</p>
 </div>
 <div class="section" id="distributed-notary-demo">
 <span id="notary-demo"></span><h2>Distributed Notary demo<a class="headerlink" href="#distributed-notary-demo" title="Permalink to this headline">¶</a></h2>
 <p>This is a simple demonstration showing a party getting transactions notarised by a distributed <a class="reference external" href="https://raft.github.io/">Raft</a>-based notary service.
@ -359,6 +367,103 @@ but we&#8217;re only interested in the row count for this demo.</p>
 </li>
 </ul>
 </div>
 <div class="section" id="simm-and-portfolio-demo-aka-the-initial-margin-agreement-demo">
 <h2>SIMM and Portfolio Demo - aka the Initial Margin Agreement Demo<a class="headerlink" href="#simm-and-portfolio-demo-aka-the-initial-margin-agreement-demo" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="background-and-simm-introduction">
 <h3>Background and SIMM Introduction<a class="headerlink" href="#background-and-simm-introduction" title="Permalink to this headline">¶</a></h3>
 <p>This app is a demonstration of how Corda can be used for the real world requirement of initial margin calculation and
 agreement; featuring the integration of complex and industry proven third party libraries into Corda nodes.</p>
 <p>SIMM is an acronym for &#8220;Standard Initial Margin Model&#8221;. It is effectively the calculation of a &#8220;margin&#8221; that is paid
 by one party to another when they agree a trade on certain types of transaction. This margin is
 paid such that, in the event of one of the counterparties suffering a credit event
 (a financial term and a polite way to say defaulting, not paying the debts that are due, or potentially even bankruptcy),
 then the party that is owed any sum already has some of the amount that it should have been paid. This payment to the
 receiving party is a preventative measure in order to reduce the risk of a potentially catastrophic default domino
 effect that caused the <a class="reference external" href="https://en.wikipedia.org/wiki/Financial_crisis_of_2007%E2%80%932008">Great Financial Crisis</a>,
 as it means that they can be assured that if they need to pay another party, they will have a proportion of the funds
 that they have been relying on.</p>
 <p>To enact this, in September 2016, the ISDA committee - with full backing from various governing bodies -
 <a class="reference external" href="http://www2.isda.org/news/isda-simm-deployed-today-new-industry-standard-for-calculating-initial-margin-widely-adopted-by-market-participants">issued a ruling on what is known as the ISDA SIMM ™ model</a>,
 a way of fairly and consistently calculating this margin. Any parties wishing to trade a financial product that is
 covered under this ruling would, independently, use this model and calculate their margin payment requirement,
 agree it with their trading counterparty and then pay (or receive, depending on the results of this calculation)
 this amount. In the case of disagreement that is not resolved in a timely fashion, this payment would increase
 and so therefore it is in the parties&#8217; interest to reach agreement in as short as time frame as possible.</p>
 <p>To be more accurate, the SIMM calculation is not performed on just one trade - it is calculated on an aggregate of
 intermediary values (which in this model are sensitivities to risk factors) from a portfolio of trades; therefore
 the input to a SIMM is actually this data, not the individual trades themselves.</p>
 <p>Also note that implementations of the SIMM are actually protected and subject to license restrictions by ISDA
 (this is due to the model itself being protected). We were fortunate enough to technically partner with
 <a class="reference external" href="http://www.opengamma.com">OpenGamma</a>  who allowed us to demonstrate the SIMM process using their proprietary model.
 In the source code released, we have replaced their analytics engine with very simple stub functions that allow
 the process to run without actually calculating correct values, and can easily be swapped out in place for their real libraries.</p>
 <p>Open the Corda samples project in IntelliJ and run the &#8220;Simm Valuation Demo&#8221; configuration</p>
 <p>Now open <a class="reference external" href="http://localhost:10005/web/simmvaluationdemo">http://localhost:10005/web/simmvaluationdemo</a> and <a class="reference external" href="http://localhost:10007/web/simmvaluationdemo">http://localhost:10007/web/simmvaluationdemo</a> to view the two
 nodes that this will have started respectively. You can now use the demo by creating trades and agreeing the valuations.
 Also see the README located in samples/simm-valuation-demo.</p>
 </div>
 <div class="section" id="what-happens-in-the-demo-notionally">
 <h3>What happens in the demo (notionally)<a class="headerlink" href="#what-happens-in-the-demo-notionally" title="Permalink to this headline">¶</a></h3>
 <dl class="docutils">
 <dt>Preliminaries</dt>
 <dd><ul class="first last simple">
 <li>Ensure that there are a number of live trades with another party financial products that are covered under the
 ISDA SIMM agreement (if none, then use the demo to enter some simple trades as described below).</li>
 </ul>
 </dd>
 <dt>Initial Margin Agreement Process</dt>
 <dd><ul class="first last simple">
 <li>Agree that one will be performing the margining calculation against a portfolio of trades with another party, and agree the trades in that portfolio. In practice, one node will start the flow but it does not matter which node does.</li>
 <li>Individually (at the node level), identify the data (static, reference etc) one will need in order to be able to calculate the metrics on those trades</li>
 <li>Confirm with the other counterparty the dataset from the above set</li>
 <li>Calculate any intermediary steps and values needed for the margin calculation (ie sensitivities to risk factors)</li>
 <li>Agree on the results of these steps</li>
 <li>Calculate the initial margin</li>
 <li>Agree on the calculation of the above with the other party</li>
 <li>In practice, pay (or receive) this margin (omitted for the sake of complexity for this example)</li>
 </ul>
 </dd>
 </dl>
 </div>
 <div class="section" id="demo-execution-step-by-step">
 <h3>Demo execution (step by step)<a class="headerlink" href="#demo-execution-step-by-step" title="Permalink to this headline">¶</a></h3>
 <p>The demonstration can be run in two ways - via IntelliJ (which will allow you to add breakpoints, debug, etc), or via gradle and the command line.</p>
 <p>Run with IntelliJ</p>
 <blockquote>
 <div><ol class="arabic simple">
 <li>Open the <code class="docutils literal"><span class="pre">corda</span></code> project with IntelliJ</li>
 <li>Run the shared run configuration &#8220;SIMM Valuation Demo&#8221;</li>
 </ol>
 </div></blockquote>
 <p>Run via CLI</p>
 <blockquote>
 <div><ol class="arabic">
 <li><p class="first">Navigate to the <code class="docutils literal"><span class="pre">samples/simm-valuation-demo</span></code> directory in your shell</p>
 </li>
 <li><p class="first">Run the gradle target <code class="docutils literal"><span class="pre">deployNodes</span></code> (ie; <code class="docutils literal"><span class="pre">./gradlew</span> <span class="pre">deployNodes</span></code> for Unix or <code class="docutils literal"><span class="pre">gradlew.bat</span></code> on Windows)</p>
 <blockquote>
 <div><ol class="loweralpha simple">
 <li>Unix: <code class="docutils literal"><span class="pre">cd</span> <span class="pre">simm-valuation-demo/build/nodes</span> <span class="pre">&amp;&amp;</span> <span class="pre">./runnodes</span></code></li>
 <li>Windows: <code class="docutils literal"><span class="pre">cd</span> <span class="pre">simm-valuation-demo/build/nodes</span> <span class="pre">&amp;</span> <span class="pre">runnodes.bat</span></code></li>
 </ol>
 </div></blockquote>
 </li>
 </ol>
 </div></blockquote>
 <dl class="docutils">
 <dt>Then (for both)</dt>
 <dd><ol class="first last arabic simple" start="3">
 <li>Browse to <a class="reference external" href="http://localhost:10005/web/simmvaluationdemo">http://localhost:10005/web/simmvaluationdemo</a></li>
 <li>Select the other counterparty (ie Bank B)</li>
 <li>Enter at least 3 trades - via the &#8220;Create New Trade&#8221; tab.</li>
 <li>On the &#8220;Agree Valuations&#8221; tab, click the &#8220;Start Calculations&#8221; button.</li>
 </ol>
 </dd>
 </dl>
 <p>Additionally, you can confirm that these trades are not visible from <a class="reference external" href="http://localhost:10009/web/simmvaluationdemo/">Bank C&#8217;s node</a>.</p>
 <p>Please note that any URL text after <cite>simmvaluationdemo</cite> should not be bookmarked or navigated directly to as they are only for aesthetics.</p>
 </div>
 </div>
 </div>
@ -368,10 +473,10 @@ but we&#8217;re only interested in the row count for this demo.</p>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="data-model.html" class="btn btn-neutral float-right" title="Data model" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="CLI-vs-IDE.html" class="btn btn-neutral float-right" title="CLI vs IDE" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="getting-set-up.html" class="btn btn-neutral" title="Getting set up" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="getting-set-up-fault-finding.html" class="btn btn-neutral" title="Getting Set Up : Faultfinding" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -380,7 +485,7 @@ but we&#8217;re only interested in the row count for this demo.</p>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/search.html
+++ b/docs/build/html/search.html
@ -87,7 +87,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -95,6 +97,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -108,23 +120,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -141,6 +151,8 @@
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -214,7 +226,7 @@
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/searchindex.js
+++ b/docs/build/html/searchindex.js
--- a/docs/build/html/secure-coding-guidelines.html
+++ b/docs/build/html/secure-coding-guidelines.html
@ -32,7 +32,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Release process" href="release-process.html"/>
-        <link rel="prev" title="Load testing" href="loadtesting.html"/> 
+        <link rel="prev" title="Introduction - What is a corda network?" href="setting-up-a-corda-network.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -89,14 +89,26 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="data-model.html">Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -104,42 +116,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Secure coding guidelines</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#flows">Flows</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#contracts">Contracts</a></li>
@ -254,7 +269,7 @@ fields are changing except the intended fields!</li>
        <a href="release-process.html" class="btn btn-neutral float-right" title="Release process" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="loadtesting.html" class="btn btn-neutral" title="Load testing" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="setting-up-a-corda-network.html" class="btn btn-neutral" title="Introduction - What is a corda network?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
@ -263,7 +278,7 @@ fields are changing except the intended fields!</li>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/setting-up-a-corda-network.html
+++ b/docs/build/html/setting-up-a-corda-network.html
@ -31,6 +31,8 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
        <link rel="next" title="Secure coding guidelines" href="secure-coding-guidelines.html"/>
        <link rel="prev" title="Load testing" href="loadtesting.html"/> 
  <script src="_static/js/modernizr.min.js"></script>
@ -87,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul>
@ -95,6 +99,16 @@
 <li class="toctree-l1"><a class="reference internal" href="transaction-data-types.html">Data types</a></li>
 <li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -108,23 +122,21 @@
 <li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
 <li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
@ -139,8 +151,17 @@
 <li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
-<ul>
+<ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="#setting-up-your-own-network">Setting up your own network</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#certificates">Certificates</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#configuration">Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#starting-the-nodes">Starting the nodes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#logging">Logging</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#connecting-to-the-nodes">Connecting to the nodes</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -290,12 +311,21 @@ Depending on your network setup you may need to tunnel to do this remotely.</p>
          </div>
          <footer>
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
        <a href="secure-coding-guidelines.html" class="btn btn-neutral float-right" title="Secure coding guidelines" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="loadtesting.html" class="btn btn-neutral" title="Load testing" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
    </div>
  <hr/>
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/docs/build/html/transaction-data-types.html
+++ b/docs/build/html/transaction-data-types.html
@ -31,7 +31,7 @@
    <link rel="top" title="R3 Corda latest documentation" href="index.html"/>
-        <link rel="next" title="Transaction Tear-offs" href="merkle-trees.html"/>
+        <link rel="next" title="Transaction tear-offs" href="merkle-trees.html"/>
        <link rel="prev" title="Data model" href="data-model.html"/> 
@ -89,7 +89,9 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="inthebox.html">What&#8217;s included?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up.html">Getting set up</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting-set-up-fault-finding.html">Getting Set Up : Faultfinding</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-the-demos.html">Running the demos</a></li>
 <li class="toctree-l1"><a class="reference internal" href="CLI-vs-IDE.html">CLI vs IDE</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Key concepts</span></p>
 <ul class="current">
@ -102,7 +104,7 @@
 <li class="toctree-l2"><a class="reference internal" href="#transaction-lifecycle-types">Transaction lifecycle types</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#party-and-publickey">Party and PublicKey</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#multi-signature-support">Multi-signature support</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#composite-keys">Composite Keys</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Composite Keys</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#verification">Verification</a></li>
 </ul>
 </li>
@ -110,8 +112,18 @@
 <li class="toctree-l2"><a class="reference internal" href="#cryptography-maths-support">Cryptography &amp; maths support</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction Tear-offs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="merkle-trees.html">Transaction tear-offs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="consensus.html">Consensus model</a></li>
 <li class="toctree-l1"><a class="reference internal" href="clauses.html">Clauses key concepts</a></li>
 </ul>
 <p class="caption"><span class="caption-text">CorDapps</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">CorDapps Background</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle plugins for CorDapps</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html">The CorDapp Template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#building-the-cordapp-template">Building the CorDapp template</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#running-the-sample-cordapp">Running the Sample CorDapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-cordapp.html#using-the-sample-cordapp">Using the sample CorDapp</a></li>
 </ul>
 <p class="caption"><span class="caption-text">The Corda node</span></p>
 <ul>
@ -119,42 +131,45 @@
 <li class="toctree-l1"><a class="reference internal" href="messaging.html">Networking and messaging</a></li>
 <li class="toctree-l1"><a class="reference internal" href="persistence.html">Persistence</a></li>
 <li class="toctree-l1"><a class="reference internal" href="node-administration.html">Node administration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-configuration-files.html">The Corda Configuration File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-configuration-file.html">Node configuration</a></li>
-<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda Plugin Framework</a></li>
+<li class="toctree-l1"><a class="reference internal" href="corda-plugins.html">The Corda plugin framework</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-services.html">A Brief Introduction To The Node Services</a></li>
+<li class="toctree-l1"><a class="reference internal" href="node-services.html">Brief introduction to the node services</a></li>
-</ul>
+<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
-<p class="caption"><span class="caption-text">CorDapps</span></p>
+<li class="toctree-l1"><a class="reference internal" href="permissioning.html">Network permissioning</a></li>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html">Creating a Cordapp</a></li>
 <li class="toctree-l1"><a class="reference internal" href="creating-a-cordapp.html#gradle-plugins-for-cordapps">Gradle Plugins for Cordapps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Tutorials</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="where-to-start.html">Where to start</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract.html">Writing a contract</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-contract-clauses.html">Writing a contract using clauses</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-test-dsl.html">Writing a contract test</a></li>
-<li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API Tutorial</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial-integration-testing.html">Integration Test Tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-clientrpc-api.html">Client RPC API tutorial</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-building-transactions.html">Building Transactions</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-state-machines.html">Writing flows</a></li>
 <li class="toctree-l1"><a class="reference internal" href="flow-testing.html">Writing flow tests</a></li>
 <li class="toctree-l1"><a class="reference internal" href="running-a-notary.html">Running a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="using-a-notary.html">Using a notary service</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html">Writing oracle services</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#implementing-an-oracle-with-continuously-varying-data">Implementing an oracle with continuously varying data</a></li>
 <li class="toctree-l1"><a class="reference internal" href="oracles.html#using-an-oracle">Using an oracle</a></li>
 <li class="toctree-l1"><a class="reference internal" href="tutorial-attachments.html">Using attachments</a></li>
 <li class="toctree-l1"><a class="reference internal" href="event-scheduling.html">Event scheduling</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Other</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="network-simulator.html">Network Simulator</a></li>
-<li class="toctree-l1"><a class="reference internal" href="node-explorer.html">Node Explorer</a></li>
+<li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial margin agreements</a></li>
 <li class="toctree-l1"><a class="reference internal" href="initial-margin-agreement.html">Initial Margin Agreements</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Component library</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="contract-catalogue.html">Contract catalogue</a></li>
-<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest Rate Swaps</a></li>
+<li class="toctree-l1"><a class="reference internal" href="contract-irs.html">Interest rate swaps</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Appendix</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="loadtesting.html">Load testing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html">Introduction - What is a corda network?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="setting-up-a-corda-network.html#setting-up-your-own-network">Setting up your own network</a></li>
 <li class="toctree-l1"><a class="reference internal" href="secure-coding-guidelines.html">Secure coding guidelines</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html">Release process</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-process.html#steps-to-cut-a-release">Steps to cut a release</a></li>
@ -344,11 +359,11 @@ fleshed out.</p>
 </div>
 </div>
 <div class="section" id="multi-signature-support">
-<h2>Multi-signature support<a class="headerlink" href="#multi-signature-support" title="Permalink to this headline">¶</a></h2>
+<span id="composite-keys"></span><h2>Multi-signature support<a class="headerlink" href="#multi-signature-support" title="Permalink to this headline">¶</a></h2>
 <p>Corda supports scenarios where more than one key or party is required to authorise a state object transition, for example:
 &#8220;Either the CEO or 3 out of 5 of his assistants need to provide signatures&#8221;.</p>
-<div class="section" id="composite-keys">
+<div class="section" id="id2">
-<h3>Composite Keys<a class="headerlink" href="#composite-keys" title="Permalink to this headline">¶</a></h3>
+<h3>Composite Keys<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
 <p>This is achieved by public key composition, using a tree data structure <code class="docutils literal"><span class="pre">CompositeKey</span></code>. A <code class="docutils literal"><span class="pre">CompositeKey</span></code> is a tree that
 stores the cryptographic public key primitives in its leaves and the composition logic in the intermediary nodes. Every intermediary
 node specifies a <em>threshold</em> of how many child signatures it requires.</p>
@ -400,7 +415,7 @@ splines. These can be found in the <a class="reference external" href="api/net.c
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-        <a href="merkle-trees.html" class="btn btn-neutral float-right" title="Transaction Tear-offs" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="merkle-trees.html" class="btn btn-neutral float-right" title="Transaction tear-offs" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
        <a href="data-model.html" class="btn btn-neutral" title="Data model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@ -412,7 +427,7 @@ splines. These can be found in the <a class="reference external" href="api/net.c
  <div role="contentinfo">
    <p>
-        &copy; Copyright 2016, Distributed Ledger Group, LLC.
+        &copy; Copyright 2016, R3 Limited.
    </p>
  </div>
--- a/Show More
+++ b/Show More