diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index 38722da..e3e47c5 100644
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -42,18 +42,23 @@
 
 2) ``Dockerfile-Unit-Test``
 
-3) ``integration_tests/Dockerfile``
+3) ``integration_tests/Dockerfile-test-delay-receiver``
+
+4) ``integration_tests/Dockerfile-query-receiver``
+
+5) ``rmr-version.yaml``
 
 rmr-python is the python binding to rmr . Installing rmr per the above does not install it.
 Bumping the rmr python version dependency requires changes in:
 
 1) ``setup.py``
 
-2) ``integration_tests/Dockerfile``
+2) ``integration_tests/Dockerfile-test-delay-receiver``
+
+3) ``integration_tests/Dockerfile-query-receiver``
 
 Run the integration tests after attempting this.
 
-
 Unit Testing
 ------------
 Note,  before this will work, for the first time on the machine running the tests, run ``./install_deps.sh``. This is only needed once on the machine.
@@ -72,94 +77,24 @@
 
 Integration testing
 -------------------
-This tests A1’s external API with two test receivers. This depends on helm+k8s, meaning you cannot run this if this is not installed.
+This tests A1’s external API with three test receivers. This depends on helm+k8s.
 
-Unlike the unit tests, however, this does not require rmr to be installed on the base system, as everything
-runs in Docker, and the Dockerfiles provide/install rmr.
+Build all the containers:
 
-First, build the latest A1 you are testing (from the root):
 ::
 
-    docker build  --no-cache -t a1:latest .
+    docker build  -t a1:latest .; cd integration_tests/; docker build  -t testreceiver:latest . -f Dockerfile-test-delay-receiver; docker build -t queryreceiver:latest . -f Dockerfile-query-receiver; cd ..
 
-Note that this step also runs the unit tests, since running the unit tests are part of the Dockerfile for A1.
 
-If you've never run the integration tests before, build the test receiver, which is referenced in the helm chart:
-::
+Then, run all the tests from the root (this requires the python packages ``tox``, ``pytest``, and ``tavern``).
 
-    cd integration_tests
-    docker build  --no-cache -t testreceiver:latest .
-
-Finally, run all the tests from the root (this requires the python packages ``tox``, ``pytest``, and ``tavern``).
 ::
 
    tox -c tox-integration.ini
 
 This script:
-1. Deploys 3 helm charts into a local kubernetes installation
+1. Deploys 2 helm charts (4 containers) into a local kubernetes installation
 2. Port forwards a pod ClusterIP to localhost
 3. Uses “tavern” to run some tests against the server
 4. Barrages the server with apache bench
 5. Tears everything down
-
-Unless you're a core A1 developer, you should probably stop here. The below instructions
-are for running A1 locally, without docker, and is much more involved (however useful when developing a1).
-
-Running locally
----------------
-
-1. Before this will work, for the first time on that machine, run ``./install_deps.sh``
-
-2. It also requires rmr-python installed. (The dockerfile does this)
-
-3. Create a ``local.rt`` file and copy it into ``/opt/route/local.rt``.
-   Note, the example one in ``integration_tests`` will need to be modified for
-   your scenario and machine.
-
-4. Copy a ric manifest into ``/opt/ricmanifest.json`` and an rmr mapping
-   table into ``/opt/rmr_string_int_mapping.txt``. You can use the test
-   ones packaged if you want:
-
-   ::
-
-     cp tests/fixtures/ricmanifest.json /opt/ricmanifest.json
-     cp tests/fixtures/rmr_string_int_mapping.txt /opt/rmr_string_int_mapping.txt
-
-5. Then:
-
-   ::
-
-     sudo pip install -e .
-     set -x LD_LIBRARY_PATH /usr/local/lib/; set -x RMR_SEED_RT /opt/route/local.rt ; set -x RMR_RCV_RETRY_INTERVAL 500; set -x RMR_RETRY_TIMES 10;
-     /usr/bin/run.py
-
-
-There are also two test receivers in ``integration_tests`` you can run locally.
-The first is meant to be used with the ``control_admission`` policy
-(that comes in test fixture ric manifest):
-
-::
-
-   set -x LD_LIBRARY_PATH /usr/local/lib/; set -x RMR_SEED_RT /opt/route/local.rt ; python receiver.py
-
-The second can be used against the ``test_policy`` policy to test the
-async nature of A1, and to test race conditions. You can start it with
-several env variables as follows:
-
-::
-
-   set -x LD_LIBRARY_PATH /usr/local/lib/; set -x RMR_SEED_RT /opt/route/local.rt ; set -x TEST_RCV_PORT 4563; set -x TEST_RCV_RETURN_MINT 10001; set -x TEST_RCV_SEC_DELAY 5; set -x TEST_RCV_RETURN_PAYLOAD '{"ACK_FROM": "DELAYED_TEST", "status": "SUCCESS"}' ; python receiver.py
-
-To test the async nature of A1, trigger a call to ``test_policy``, which
-will target the delayed receiver, then immediately call
-``control_admission``. The ``control_admission`` policy return should be
-returned immediately, whereas the ``test_policy`` should return after
-about ``TEST_RCV_SEC_DELAY 5``. The ``test_policy`` should not block A1
-while it is sleeping, and both responses should be correct.
-
-::
-
-   curl -v -X PUT -H "Content-Type: application/json" -d '{}' localhost:10000/ric/policies/test_policy
-   curl -v -X PUT -H "Content-Type: application/json" -d '{ "enforce":true, "window_length":10, "blocking_rate":20, "trigger_threshold":10 }' localhost:10000/ric/policies/admission_control_policy
-   curl -v localhost:10000/ric/policies/admission_control_policy
-   curl -v localhost:10000/a1-p/healthcheck
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 485f5a8..002be1e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -14,16 +14,16 @@
    :depth: 3
    :local:
 
-[1.x.x] - TBD
+[x.x.x] - TBD
 -------------
 
 ::
 
-    * Represents a resillent version of 1.0.0 that uses Redis for persistence
+    * Represents a resillent version of x.x.x that uses Redis for persistence
 
 
-[x.x.x] - TBD
--------------
+[2.0.0] - 12/9/2019
+-------------------
 
 ::
 
@@ -31,7 +31,7 @@
     * Eliminates the barrier to deleting an instance when no xapp evdr replied (via timeouts)
     * Add two new ENV variables that control timeouts
     * Make unit tests more modular so new workflows can be tested easily
-    * Changes the API for ../status to return a richer structure
+    * Fixes the API for ../status to return a richer structure. This is an (albeit tiny) API change.
     * Clean up unused items in the integration tests helm chart
     * Removed "RMR_RCV_RETRY_INTERVAL" leftovers since this isn't used anymore
     * Uses the standard RIC logging library
@@ -39,6 +39,7 @@
     * Given the above, policy type ids can be any valid 32bit greater than 0
     * Decouple the API between northbound and A1 from A1 with xapps. This is now two seperate OpenAPI files
     * Update example for AC Xapp
+    * Updgrade rmr and rmr-python to utilize new features; lots of cleanups because of that
 
 [1.0.4]
 -------