diff --git a/README.md b/README.md
index 9632f5e..a724e32 100644
--- a/README.md
+++ b/README.md
@@ -90,84 +90,18 @@ Source code for the example is located in /src/main/java/com/openfin/desktop/dem
 	});
 ```
 
-## Run the example of docking Java Swing window with HTML5 application
-
-1. Clone this repository
-
-2. Go to release directory and start docking.bat
-
-3. Once the java app starts, click on "Launch OpenFin" button, which should start OpenFin Runtime and "Hello OpenFin" HTML5 demo app.  The java app will wait and try to connect to OpenFin Runtime.
-
-4. After clicking "Dock to HTML5 app" button, you can move either window to see docking effect.
-
-5. Click "Undock from HTML5 app" to undock 2 windows
-
-## Source Code Review for docking windows
-
-Source code for the example is located in /src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java.  
-
-1. Create connection object:
-
-```java
-	this.desktopConnection = new DesktopConnection("OpenFinDockingDemo", "localhost", port);
-```
-
-   This code just creates an instance and it does not try to connect to runtime.
-
-2. Launch and connect to stable version of OpenFin runtime:
-
-```java
-	desktopConnection.connectToVersion("stable", listener, 60);
-```
-
-   listener is an instance of DesktopStateListener which provides callback on status of connections to runtime.
-
-3. Once Runtime is running, an instance of DockingManager is create with
-
-```java
-	this.dockingManager = new DockingManager(this.desktopConnection, javaParentAppUuid);
-```
-
-4. Any OpenFin window can be registered with DockingManager with
-
-```java
-	dockingManager.registerWindow(openFinWindow);
-```
-
-5. Any Java window can be registered with DockingManager with
-
-```java
-	dockingManager.registerJavaWindow(javaWindowName, jFrame, AckListener);
-```
-
-6. An application can receive dock and undock events from DockingManger with
-
-```java
-	desktopConnection.getInterApplicationBus().subscribe("*", "window-docked", EventListener);
-	desktopConnection.getInterApplicationBus().subscribe("*", "window-undocked", EventListener);
-```
-
-7. An application can request DockingManager to undock a window with:
-
-```java
-	JSONObject msg = new JSONObject();
-	msg.put("applicationUuid", javaParentAppUuid);
-	msg.put("windowName", javaWindowName);
-	desktopConnection.getInterApplicationBus().publish("undock-window", msg);
-```
-
-Once the demo is running, Windows snap while being draggted close to other windows.  Snapped windows dock on mounse release. 
-
 ## Run the example of embedding HTML5 application into a Java Swing window
 
 1. Clone this repository
 
-2. Go to release directory and start embed.bat
+2. Go to release directory and start embed.bat ( the default embedded url is https://openfin.co. Pass the url you wish to load if you want something different e.g. embed.bat https://www.mydomain.com )
 
-3. Once the java app starts, click on "Launch OpenFin" button, which should start OpenFin Runtime and embed the OpenFin application that points to https://openfin.co
+3. Once the java app starts, click on "Launch OpenFin" button, which should start OpenFin Runtime and embed the OpenFin application that points to https://openfin.co (or your custom url if you specified one)
 
 4. Click "Shutdown OpenFin" button to close HTML5 application and the Java Swing window
 
+If there is a problem rendering the url please check your windows display settings to see ensure scaling is set to 100%.
+
 ## Source Code Review for embedded OpenFin application
 
 Source code for the example is located in /src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
index e75f041..61be86c 100644
--- a/RELEASENOTES-ADAPTER.md
+++ b/RELEASENOTES-ADAPTER.md
@@ -1,3 +1,12 @@
+# Version 7.2.1
+## New Features
+* Add support for FDC3 service
+
+# Version 7.1.3
+## New Features
+* Add support for the new notification service
+* DesktopStateListener.onError is called for exceptions from websocket
+
 # Version 7.1.2
 ## Bug Fixes
 
diff --git a/pom.xml b/pom.xml
index 46bccd4..d5e3e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>co.openfin</groupId>
     <artifactId>openfin-desktop-java-example</artifactId>
-    <version>7.1.1</version>
+    <version>9.0.1</version>
     <packaging>jar</packaging>
 
     <name>openfin-desktop-java-example</name>
@@ -58,12 +58,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>7.1.3-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>co.openfin</groupId>
-            <artifactId>openfin-snap-dock</artifactId>
-            <version>1.0.0.1</version>
+            <version>9.2.0</version>
         </dependency>
         <dependency>
             <groupId>tablelayout</groupId>
diff --git a/release/channel.bat b/release/channel.bat
new file mode 100644
index 0000000..492c1d2
--- /dev/null
+++ b/release/channel.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+REM This program is an example of channel API.   It can be run as channel provider or client
+REM Channel name: ChannelExample
+REM usage:  channel.bat [ provider | client ]
+set mode=%1
+IF "%~1" == "" set mode=provider
+echo Channel type set to: %mode%
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.ChannelExample %mode%
+
diff --git a/release/docking.bat b/release/docking.bat
deleted file mode 100644
index 9a50a30..0000000
--- a/release/docking.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-REM batch to run Docking example of OpenFin and Java windows with Layout service.
-REM layout.html is a simple example of OpenFin window that uses Layout service.
-REM For this example to work, layout.html needs to be hosted by a web server and its URL needs to be configured with -Dcom.openfin.demo.layout.url
-
-java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.layout.url=http://localhost:8008/layout.html com.openfin.desktop.demo.LayoutServiceDemo
diff --git a/release/embed.bat b/release/embed.bat
index 2646f66..6533229 100644
--- a/release/embed.bat
+++ b/release/embed.bat
@@ -1 +1,5 @@
-java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.1.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
\ No newline at end of file
+@ECHO OFF
+set url=%1 
+IF "%~1" == "" set url=https://openfin.co
+echo Embedded url set to: %url%
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=%URL% -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
diff --git a/release/fxdemo.bat b/release/fxdemo.bat
index ec7a4d9..e37e8fd 100644
--- a/release/fxdemo.bat
+++ b/release/fxdemo.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.1.3-SNAPSHOT.jar;openfin-desktop-java-adapter-7.0.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co com.openfin.desktop.demo.FxDemo
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=https://openfin.co com.openfin.desktop.demo.FxDemo
diff --git a/release/jetty-io-9.3.12.v20160915.jar b/release/jetty-io-9.3.12.v20160915.jar
deleted file mode 100644
index e83d5ca..0000000
Binary files a/release/jetty-io-9.3.12.v20160915.jar and /dev/null differ
diff --git a/release/jetty-util-9.3.12.v20160915.jar b/release/jetty-util-9.3.12.v20160915.jar
deleted file mode 100644
index 57366eb..0000000
Binary files a/release/jetty-util-9.3.12.v20160915.jar and /dev/null differ
diff --git a/release/jna-4.1.0.jar b/release/jna-4.1.0.jar
deleted file mode 100644
index 9bbb63d..0000000
Binary files a/release/jna-4.1.0.jar and /dev/null differ
diff --git a/release/jna-4.2.2.jar b/release/jna-4.2.2.jar
deleted file mode 100644
index a943670..0000000
Binary files a/release/jna-4.2.2.jar and /dev/null differ
diff --git a/release/jna-platform-4.1.0.jar b/release/jna-platform-4.1.0.jar
deleted file mode 100644
index b4ce438..0000000
Binary files a/release/jna-platform-4.1.0.jar and /dev/null differ
diff --git a/release/jna-platform-4.2.2.jar b/release/jna-platform-4.2.2.jar
deleted file mode 100644
index f3a9fd2..0000000
Binary files a/release/jna-platform-4.2.2.jar and /dev/null differ
diff --git a/release/json-20140107.jar b/release/json-20140107.jar
deleted file mode 100644
index 9037768..0000000
Binary files a/release/json-20140107.jar and /dev/null differ
diff --git a/release/junit.bat b/release/junit.bat
index b6c9af5..b79d81f 100644
--- a/release/junit.bat
+++ b/release/junit.bat
@@ -6,4 +6,4 @@ set RuntimeVersion="stable"
 set RuntimeVersion="%1"
 )
 
-java -cp openfin-desktop-java-example-7.1.1-tests.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20160810.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.2.0.jar;lib/openfin-desktop-java-example-9.2.1-tests.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
diff --git a/release/launchExternal.html b/release/launchExternal.html
new file mode 100644
index 0000000..18ba220
--- /dev/null
+++ b/release/launchExternal.html
@@ -0,0 +1,45 @@
+<html>
+<head>
+    <title>LaunchExternalProcess example</title>
+ 
+    <script type="text/javascript">
+
+        window.addEventListener("DOMContentLoaded", function() {
+
+            fin.desktop.InterApplicationBus.subscribe('*', 'messageFromJavaTopic',  m => {
+                document.getElementById("messageFromJava").innerText = JSON.stringify(m);
+                console.log(m);
+            });
+
+        });
+
+        function launch() {
+            const inputBox = document.getElementById('path');
+            
+
+            fin.System.launchExternalProcess({
+                path: inputBox.value,
+                arguments: "",
+                listener: function (result) {
+                    console.log('the exit code', result.exitCode);
+                }
+            }).then(processIdentity => console.log(processIdentity)).catch(err => console.log(err));
+        }
+
+</script>
+</head>
+<body>
+<script>
+
+</script>
+
+<p>LaunchExternalProcess example</p>
+<div id="messageFromJava">
+</div>
+<div>
+    Full Path <input  id="path" type="text" style="width: 400px" ></input>
+    <Button id="launch" onclick="launch()"> Launch </Button>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/release/layout.html b/release/layout.html
index bdf0d95..eba023b 100644
--- a/release/layout.html
+++ b/release/layout.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title>Openfin Layouts Included</title>
+    <title>Openfin Layouts Example</title>
     <script src="https://cdn.openfin.co/services/openfin/layouts/1.0.0/openfin-layouts.js"></script>
 
     <script type="text/javascript">
diff --git a/release/TableLayout-20050920.jar b/release/lib/TableLayout-20050920.jar
similarity index 100%
rename from release/TableLayout-20050920.jar
rename to release/lib/TableLayout-20050920.jar
diff --git a/release/hamcrest-core-1.3.jar b/release/lib/hamcrest-core-1.3.jar
similarity index 100%
rename from release/hamcrest-core-1.3.jar
rename to release/lib/hamcrest-core-1.3.jar
diff --git a/release/hamcrest-library-1.1.jar b/release/lib/hamcrest-library-1.1.jar
similarity index 100%
rename from release/hamcrest-library-1.1.jar
rename to release/lib/hamcrest-library-1.1.jar
diff --git a/release/lib/jetty-client-9.4.18.v20190429.jar b/release/lib/jetty-client-9.4.18.v20190429.jar
new file mode 100644
index 0000000..b3868e1
Binary files /dev/null and b/release/lib/jetty-client-9.4.18.v20190429.jar differ
diff --git a/release/lib/jetty-http-9.4.18.v20190429.jar b/release/lib/jetty-http-9.4.18.v20190429.jar
new file mode 100644
index 0000000..e2e6282
Binary files /dev/null and b/release/lib/jetty-http-9.4.18.v20190429.jar differ
diff --git a/release/lib/jetty-io-9.4.18.v20190429.jar b/release/lib/jetty-io-9.4.18.v20190429.jar
new file mode 100644
index 0000000..56acc56
Binary files /dev/null and b/release/lib/jetty-io-9.4.18.v20190429.jar differ
diff --git a/release/lib/jetty-util-9.4.18.v20190429.jar b/release/lib/jetty-util-9.4.18.v20190429.jar
new file mode 100644
index 0000000..b80bfe8
Binary files /dev/null and b/release/lib/jetty-util-9.4.18.v20190429.jar differ
diff --git a/release/lib/jetty-xml-9.4.18.v20190429.jar b/release/lib/jetty-xml-9.4.18.v20190429.jar
new file mode 100644
index 0000000..51aa9a5
Binary files /dev/null and b/release/lib/jetty-xml-9.4.18.v20190429.jar differ
diff --git a/release/jna-4.5.1.jar b/release/lib/jna-4.5.1.jar
similarity index 100%
rename from release/jna-4.5.1.jar
rename to release/lib/jna-4.5.1.jar
diff --git a/release/jna-platform-4.5.1.jar b/release/lib/jna-platform-4.5.1.jar
similarity index 100%
rename from release/jna-platform-4.5.1.jar
rename to release/lib/jna-platform-4.5.1.jar
diff --git a/release/json-20160810.jar b/release/lib/json-20160810.jar
similarity index 100%
rename from release/json-20160810.jar
rename to release/lib/json-20160810.jar
diff --git a/release/junit-4.11.jar b/release/lib/junit-4.11.jar
similarity index 100%
rename from release/junit-4.11.jar
rename to release/lib/junit-4.11.jar
diff --git a/release/log4j-1.2.17.jar b/release/lib/log4j-1.2.17.jar
similarity index 100%
rename from release/log4j-1.2.17.jar
rename to release/lib/log4j-1.2.17.jar
diff --git a/release/mockito-core-1.9.5.jar b/release/lib/mockito-core-1.9.5.jar
similarity index 100%
rename from release/mockito-core-1.9.5.jar
rename to release/lib/mockito-core-1.9.5.jar
diff --git a/release/lib/objenesis-1.0.jar b/release/lib/objenesis-1.0.jar
new file mode 100644
index 0000000..7813d7b
Binary files /dev/null and b/release/lib/objenesis-1.0.jar differ
diff --git a/release/lib/openfin-desktop-java-adapter-9.2.0.jar b/release/lib/openfin-desktop-java-adapter-9.2.0.jar
new file mode 100644
index 0000000..8e5fff9
Binary files /dev/null and b/release/lib/openfin-desktop-java-adapter-9.2.0.jar differ
diff --git a/release/lib/openfin-desktop-java-example-9.0.1.jar b/release/lib/openfin-desktop-java-example-9.0.1.jar
new file mode 100644
index 0000000..e4c2bae
Binary files /dev/null and b/release/lib/openfin-desktop-java-example-9.0.1.jar differ
diff --git a/release/lib/openfin-desktop-java-example-9.2.1-tests.jar b/release/lib/openfin-desktop-java-example-9.2.1-tests.jar
new file mode 100644
index 0000000..2611d69
Binary files /dev/null and b/release/lib/openfin-desktop-java-example-9.2.1-tests.jar differ
diff --git a/release/lib/openfin-desktop-java-example-9.2.2.jar b/release/lib/openfin-desktop-java-example-9.2.2.jar
new file mode 100644
index 0000000..dea5aac
Binary files /dev/null and b/release/lib/openfin-desktop-java-example-9.2.2.jar differ
diff --git a/release/lib/slf4j-api-1.7.21.jar b/release/lib/slf4j-api-1.7.21.jar
new file mode 100644
index 0000000..2a5c33e
Binary files /dev/null and b/release/lib/slf4j-api-1.7.21.jar differ
diff --git a/release/slf4j-jdk14-1.6.1.jar b/release/lib/slf4j-jdk14-1.6.1.jar
similarity index 100%
rename from release/slf4j-jdk14-1.6.1.jar
rename to release/lib/slf4j-jdk14-1.6.1.jar
diff --git a/release/slf4j-log4j12-1.7.18.jar b/release/lib/slf4j-log4j12-1.7.18.jar
similarity index 100%
rename from release/slf4j-log4j12-1.7.18.jar
rename to release/lib/slf4j-log4j12-1.7.18.jar
diff --git a/release/lib/websocket-api-9.4.18.v20190429.jar b/release/lib/websocket-api-9.4.18.v20190429.jar
new file mode 100644
index 0000000..36b50c3
Binary files /dev/null and b/release/lib/websocket-api-9.4.18.v20190429.jar differ
diff --git a/release/lib/websocket-client-9.4.18.v20190429.jar b/release/lib/websocket-client-9.4.18.v20190429.jar
new file mode 100644
index 0000000..705d984
Binary files /dev/null and b/release/lib/websocket-client-9.4.18.v20190429.jar differ
diff --git a/release/lib/websocket-common-9.4.18.v20190429.jar b/release/lib/websocket-common-9.4.18.v20190429.jar
new file mode 100644
index 0000000..b72c12e
Binary files /dev/null and b/release/lib/websocket-common-9.4.18.v20190429.jar differ
diff --git a/release/manifest.bat b/release/manifest.bat
index e696de7..4ba01e9 100644
--- a/release/manifest.bat
+++ b/release/manifest.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.2.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties com.openfin.desktop.demo.LaunchManifestDemo
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties com.openfin.desktop.demo.LaunchManifestDemo
diff --git a/release/notification.bat b/release/notification.bat
new file mode 100644
index 0000000..89db9a2
--- /dev/null
+++ b/release/notification.bat
@@ -0,0 +1,2 @@
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.11-SNAPSHOT.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.NotificationServiceDemo
+
diff --git a/release/openfin-desktop-java-adapter-7.1.2.jar b/release/openfin-desktop-java-adapter-7.1.2.jar
deleted file mode 100644
index bda96c7..0000000
Binary files a/release/openfin-desktop-java-adapter-7.1.2.jar and /dev/null differ
diff --git a/release/openfin-desktop-java-adapter-7.1.3-SNAPSHOT.jar b/release/openfin-desktop-java-adapter-7.1.3-SNAPSHOT.jar
deleted file mode 100644
index 0a73c3a..0000000
Binary files a/release/openfin-desktop-java-adapter-7.1.3-SNAPSHOT.jar and /dev/null differ
diff --git a/release/openfin-desktop-java-example-7.1.1-tests.jar b/release/openfin-desktop-java-example-7.1.1-tests.jar
deleted file mode 100644
index 0c835de..0000000
Binary files a/release/openfin-desktop-java-example-7.1.1-tests.jar and /dev/null differ
diff --git a/release/openfin-desktop-java-example-7.1.1.jar b/release/openfin-desktop-java-example-7.1.1.jar
deleted file mode 100644
index fd5cc42..0000000
Binary files a/release/openfin-desktop-java-example-7.1.1.jar and /dev/null differ
diff --git a/release/profile.bat b/release/profile.bat
new file mode 100644
index 0000000..9e1cf11
--- /dev/null
+++ b/release/profile.bat
@@ -0,0 +1,2 @@
+java -Xmx100m -Xms100m -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.2.3-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1-tests.jar;lib/openfin-desktop-java-example-9.2.2.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable -Dcom.openfin.demo.licenseKey=123456 com.openfin.desktop.demo.MemoryProfile
+
diff --git a/release/publisher.bat b/release/publisher.bat
index a783a3f..abc104f 100644
--- a/release/publisher.bat
+++ b/release/publisher.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.0.0.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=canary -Dcom.openfin.demo.publish.frequency=2000 -Dcom.openfin.demo.publish.size=2048 com.openfin.desktop.demo.PubSubTest publisher
\ No newline at end of file
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=canary -Dcom.openfin.demo.publish.frequency=2000 -Dcom.openfin.demo.publish.size=2048 com.openfin.desktop.demo.PubSubTest publisher
diff --git a/release/run.bat b/release/run.bat
index 73dc02d..adb4460 100644
--- a/release/run.bat
+++ b/release/run.bat
@@ -1,2 +1,2 @@
-java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.5.1.jar;jna-platform-4.5.1.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.OpenFinDesktopDemo
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1-tests.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable -Dcom.openfin.demo.licenseKey=123456 com.openfin.desktop.demo.OpenFinDesktopDemo
 
diff --git a/release/run.sh b/release/run.sh
index 592a904..624679c 100755
--- a/release/run.sh
+++ b/release/run.sh
@@ -13,5 +13,5 @@
 #fi
 #node cli.js -l -c $configFile
 
-java -cp openfin-desktop-java-example-6.0.1.2.jar:openfin-desktop-java-adapter-6.0.1.3-SNAPSHOT.jar:TableLayout-20050920.jar:jna-4.2.2.jar:jna-platform-4.2.2.jar:json-20140107.jar:slf4j-api-1.7.5.jar:slf4j-jdk14-1.6.1.jar:websocket-api-9.3.12.v20160915.jar:websocket-client-9.3.12.v20160915.jar:websocket-common-9.3.12.v20160915.jar:jetty-io-9.3.12.v20160915.jar:jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.installer.location=/path-to-openfin-cli/start.sh  -Dcom.openfin.demo.version=8.56.27.22 com.openfin.desktop.demo.OpenFinDesktopDemo
+java -cp openfin-desktop-java-example-7.1.1.jar;openfin-desktop-java-adapter-7.1.2.jar:TableLayout-20050920.jar:jna-4.2.2.jar:jna-platform-4.2.2.jar:json-20140107.jar:slf4j-api-1.7.5.jar:slf4j-jdk14-1.6.1.jar:websocket-api-9.3.12.v20160915.jar:websocket-client-9.3.12.v20160915.jar:websocket-common-9.3.12.v20160915.jar:jetty-io-9.3.12.v20160915.jar:jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.installer.location=/path-to-openfin-cli/start.sh  -Dcom.openfin.demo.version=8.56.27.22 com.openfin.desktop.demo.OpenFinDesktopDemo
 
diff --git a/release/slf4j-api-1.7.5.jar b/release/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8f004d3..0000000
Binary files a/release/slf4j-api-1.7.5.jar and /dev/null differ
diff --git a/release/subscriber.bat b/release/subscriber.bat
index bd776ec..b93d3ab 100644
--- a/release/subscriber.bat
+++ b/release/subscriber.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-6.0.0.1.jar;openfin-desktop-java-adapter-6.0.0.1-SNAPSHOT.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar;websocket-api-9.3.12.v20160915.jar;websocket-client-9.3.12.v20160915.jar;websocket-common-9.3.12.v20160915.jar;jetty-io-9.3.12.v20160915.jar;jetty-util-9.3.12.v20160915.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=canary com.openfin.desktop.demo.PubSubTest subscriber
\ No newline at end of file
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar  -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=canary com.openfin.desktop.demo.PubSubTest subscriber
diff --git a/release/testWindowPosition.bat b/release/testWindowPosition.bat
index 65cdfc7..9060f08 100644
--- a/release/testWindowPosition.bat
+++ b/release/testWindowPosition.bat
@@ -1 +1 @@
-java -cp openfin-desktop-java-example-5.44.2.3-tests.jar;openfin-desktop-java-adapter-5.44.2.3.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar -Djava.util.logging.config.file=logging.properties org.junit.runner.JUnitCore com.openfin.desktop.WindowPositionTest
+java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties org.junit.runner.JUnitCore com.openfin.desktop.WindowPositionTest
diff --git a/release/websocket-api-9.3.12.v20160915.jar b/release/websocket-api-9.3.12.v20160915.jar
deleted file mode 100644
index 2d0e662..0000000
Binary files a/release/websocket-api-9.3.12.v20160915.jar and /dev/null differ
diff --git a/release/websocket-client-9.3.12.v20160915.jar b/release/websocket-client-9.3.12.v20160915.jar
deleted file mode 100644
index db68054..0000000
Binary files a/release/websocket-client-9.3.12.v20160915.jar and /dev/null differ
diff --git a/release/websocket-common-9.3.12.v20160915.jar b/release/websocket-common-9.3.12.v20160915.jar
deleted file mode 100644
index 2e9e3cd..0000000
Binary files a/release/websocket-common-9.3.12.v20160915.jar and /dev/null differ
diff --git a/src/main/java/com/openfin/desktop/demo/ChannelExample.java b/src/main/java/com/openfin/desktop/demo/ChannelExample.java
index e01e63c..0eba6b6 100644
--- a/src/main/java/com/openfin/desktop/demo/ChannelExample.java
+++ b/src/main/java/com/openfin/desktop/demo/ChannelExample.java
@@ -24,9 +24,15 @@ public class ChannelExample implements DesktopStateListener {
 
     private DesktopConnection desktopConnection;
 
+    private static String channelType;  // client or provider, if not set, both
+
     public ChannelExample() {
         try {
-            desktopConnection = new DesktopConnection("ChannelExample");
+            StringBuilder sb = new StringBuilder("ChannelExample");
+            if (channelType != null) {
+                sb.append(channelType);
+            }
+            desktopConnection = new DesktopConnection(sb.toString());
             String desktopVersion = java.lang.System.getProperty("com.openfin.demo.runtime.version", "stable");
             RuntimeConfiguration configuration = new RuntimeConfiguration();
             configuration.setRuntimeVersion(desktopVersion);
@@ -41,51 +47,114 @@ public ChannelExample() {
      * Create a provider that supports "getValue", "increment" and "incrementBy n" actions
      */
     public void createChannelProvider() {
-        desktopConnection.getChannel().addChannelListener(new ChannelListener() {
-            @Override
-            public void onChannelConnect(ConnectionEvent connectionEvent) {
-                logger.info(String.format("provider receives channel connect event from %s ", connectionEvent.getUuid()));
-            }
-            @Override
-            public void onChannelDisconnect(ConnectionEvent connectionEvent) {
-                logger.info(String.format("provider receives channel disconnect event from %s ", connectionEvent.getUuid()));
-            }
-        });
-        desktopConnection.getChannel().create(CHANNEL_NAME, new AsyncCallback<ChannelProvider>() {
-            @Override
-            public void onSuccess(ChannelProvider provider) {
-                //provider created, register actions.
-                AtomicInteger x = new AtomicInteger(0);
-
-                provider.register("getValue", new ChannelAction() {
-                    @Override
-                    public JSONObject invoke(String action, JSONObject payload) {
-                        logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
-                        JSONObject obj = new JSONObject();
-                        obj.put("value", x.get());
-                        return obj;
-                    }
-                });
-                provider.register("increment", new ChannelAction() {
-                    @Override
-                    public JSONObject invoke(String action, JSONObject payload) {
-                        logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
-                        JSONObject obj = new JSONObject();
-                        obj.put("value", x.incrementAndGet());
-                        return obj;
-                    }
-                });
-                provider.register("incrementBy", new ChannelAction() {
-                    @Override
-                    public JSONObject invoke(String action, JSONObject payload) {
-                        logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
-                        int delta = payload.getInt("delta");
-                        JSONObject obj = new JSONObject();
-                        obj.put("value", x.addAndGet(delta));
-                        return obj;
+
+        // Create the channel provider.
+        desktopConnection.getChannel(CHANNEL_NAME).createAsync().thenAccept(provider -> {
+            provider.addProviderListener(new ChannelProviderListener() {
+
+                // Create the onChannelConnect event handler.
+                @Override
+                public void onClientConnect(ChannelClientConnectEvent connectionEvent) throws Exception {
+
+                    // Add a line to the log file to identify the UUID of the caller.
+                    logger.info(String.format("provider receives client connect event from %s ", connectionEvent.getUuid()));
+
+                    // Extract the JSON payload.
+                    JSONObject payload = (JSONObject) connectionEvent.getPayload();
+
+                    // If the "name" element of the payload says the client is invalid, reject the request.
+                    if (payload != null) {
+                        String name = payload.optString("name");
+                        if ("Invalid Client".equals(name)) {
+                            throw new Exception("request rejected");
+                        }
                     }
-                });
-            }
+                }
+
+                // Create the onChannelDisconnect event handler.
+                @Override
+                public void onClientDisconnect(ChannelClientConnectEvent connectionEvent) {
+
+                    // Add a line to the log file identifying the UUID of the caller.
+                    logger.info(String.format("provider receives channel disconnect event from %s ", connectionEvent.getUuid()));
+                }
+            });
+
+            // The provider was created. Now to register the actions.
+            // ------------------------------------------------------
+
+            // This variable is used as the "value" element for the getValue, increment, and incrementBy actions.
+            AtomicInteger localInteger = new AtomicInteger(0);
+
+            // Register the "getValue" action.
+            // This action will return the value of the localInteger variable.
+            provider.register("getValue", new ChannelAction() {
+
+                // This is the logic for the "getValue" action.
+                @Override
+                public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+
+                    // Write a string to the logfile that shows the requested action and payload.
+                    logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
+
+                    // Create a JSON object to return to the channel client.
+                    JSONObject obj = new JSONObject();
+
+                    // Set the "value" JSON element to the value of the localInteger variable.
+                    obj.put("value", localInteger.get());
+
+                    // Return the JSON object to the channel client.
+                    return obj;
+                }
+            });
+
+            // Register the "increment" action.
+            // This action will increment the value of the localInteger variable by one.
+            provider.register("increment", new ChannelAction() {
+
+                // This is the logic for the "increment" action.
+                @Override
+                public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+
+                    // Write a string to the logfile that identifies the action and payload.
+                    logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
+
+                    // Create a JSON object to return to the channel client.
+                    JSONObject obj = new JSONObject();
+
+                    // Increment localInteger and set the "value" JSON element to the new value of localInteger.
+                    obj.put("value", localInteger.incrementAndGet());
+                    provider.publish("event", obj, null);
+
+                    // Return the JSON object to the channel client.
+                    return obj;
+                }
+            });
+
+            // Register the "incrementBy" action.
+            // This action will increment the value of the localInteger variable by a specified amount.
+            provider.register("incrementBy", new ChannelAction() {
+
+                // This is the logic for the "incrementBy" action.
+                @Override
+                public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+
+                    // Write a string to the logfile that identifies the action and payload.
+                    logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
+
+                    // Extract the increment amount (delta) from the payload JSON object.
+                    int delta = ((JSONObject)payload).getInt("delta");
+
+                    // Create a new JSON object to return to the channel client.
+                    JSONObject obj = new JSONObject();
+
+                    // Increase localInteger by the delta amount and set the "value" JSON element to the new value of localInteger.
+                    obj.put("value", localInteger.addAndGet(delta));
+
+                    // Return the new JSON object to the channel client.
+                    return obj;
+                }
+            });
         });
     }
 
@@ -93,73 +162,90 @@ public JSONObject invoke(String action, JSONObject payload) {
      * Create a channel client that invokes "getValue", "increment" and "incrementBy n" actions
      */
     public void createChannelClient() {
-        desktopConnection.getChannel().connect(CHANNEL_NAME, new AsyncCallback<ChannelClient>() {
-            @Override
-            public void onSuccess(ChannelClient client) {
-                //connected to provider, invoke actions provided by the provider.
-                //get current value
-                client.dispatch("getValue", null, new AckListener() {
-                    @Override
-                    public void onSuccess(Ack ack) {
-                        logger.info("current value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
-
-                        //got current value, do increment
-                        client.dispatch("increment", null, new AckListener() {
-                            @Override
-                            public void onSuccess(Ack ack) {
-                                logger.info("after invoking increment, value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
-
-                                //let's do increatmentBy 10
-                                JSONObject payload = new JSONObject();
-                                payload.put("delta", 10);
-                                client.dispatch("incrementBy", payload, new AckListener() {
-                                    @Override
-                                    public void onSuccess(Ack ack) {
-                                        logger.info("after invoking incrementBy, value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
-
-                                        try {
-                                            desktopConnection.disconnect();
-                                        }
-                                        catch (DesktopException e) {
-                                            e.printStackTrace();
-                                        }
-                                    }
+        JSONObject payload = new JSONObject();
+        payload.put("name", "java example");
+        desktopConnection.getChannel(CHANNEL_NAME).connectAsync(false, payload).thenAccept(client -> {
+            client.addChannelListener(new ChannelListener() {
+                @Override
+                public void onChannelConnect(ConnectionEvent connectionEvent) {
+                }
+                @Override
+                public void onChannelDisconnect(ConnectionEvent connectionEvent) {
+                    logger.info("channel disconnected {}", connectionEvent.getChannelId());
+                }
+            });
+            client.register("event", new ChannelAction() {
+                @Override
+                public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+                    logger.info("channel event {}", action);
+                    return null;
+                }
+            });
 
-                                    @Override
-                                    public void onError(Ack ack) {
+            client.dispatch("getValue", null, new AckListener() {
+                @Override
+                public void onSuccess(Ack ack) {
+                    logger.info("current value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
+
+                    //got current value, do increment
+                    client.dispatch("increment", null, new AckListener() {
+                        @Override
+                        public void onSuccess(Ack ack) {
+                            logger.info("after invoking increment, value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
+
+                            //let's do increatmentBy 10
+                            JSONObject payload = new JSONObject();
+                            payload.put("delta", 10);
+                            client.dispatch("incrementBy", payload, new AckListener() {
+                                @Override
+                                public void onSuccess(Ack ack) {
+                                    logger.info("after invoking incrementBy, value={}", ack.getJsonObject().getJSONObject("data").getJSONObject("result").getInt("value"));
+
+                                    try {
+                                        desktopConnection.disconnect();
+                                    } catch (DesktopException e) {
+                                        e.printStackTrace();
                                     }
-                                });
-                            }
+                                }
 
-                            @Override
-                            public void onError(Ack ack) {
-                            }
-                        });
-                    }
+                                @Override
+                                public void onError(Ack ack) {
+                                }
+                            });
+                        }
 
-                    @Override
-                    public void onError(Ack ack) {
-                    }
-                });
-            }
+                        @Override
+                        public void onError(Ack ack) {
+                        }
+                    });
+                }
 
+                @Override
+                public void onError(Ack ack) {
+                }
+            });
         });
     }
 
     @Override
     public void onReady() {
-        createChannelProvider();
-        createChannelClient();
+        if ("provider".equals(channelType) || channelType == null) {
+            createChannelProvider();
+        }
+        if ("client".equals(channelType) || channelType == null) {
+            createChannelClient();
+        }
     }
 
     @Override
     public void onClose(String error) {
+        logger.info("onClose, value={}", error);
         latch.countDown();
     }
 
     @Override
     public void onError(String reason) {
-
+        logger.info("onError, value={}", reason);
     }
 
     @Override
@@ -173,7 +259,9 @@ public void onOutgoingMessage(String message) {
     }
 
     public static void main(String[] args) {
-
+        if (args.length > 0) {
+            channelType = args[0];
+        }
         try {
             new ChannelExample();
             latch.await();
@@ -182,5 +270,7 @@ public static void main(String[] args) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
+
+        java.lang.System.exit(0);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/openfin/desktop/demo/DockingDemo2.java b/src/main/java/com/openfin/desktop/demo/DockingDemo2.java
deleted file mode 100644
index cf6589c..0000000
--- a/src/main/java/com/openfin/desktop/demo/DockingDemo2.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.openfin.desktop.demo;
-
-import com.openfin.desktop.*;
-import com.openfin.desktop.win32.ExternalWindowObserver;
-import info.clearthought.layout.TableLayout;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-
-/**
- * This app works with OpenFinDockingDemo as another dockable Java window
- *
- * Created by wche on 3/9/2016.
- */
-public class DockingDemo2 extends JPanel implements ActionListener, WindowListener {
-    private final static Logger logger = LoggerFactory.getLogger(DockingDemo2.class.getName());
-
-    protected String javaParentAppUuid = "Java Parent App";  // Its value must match OpenFinDockingDemo.  Please see OpenFinDockingDemo for comments
-
-    protected String appUuid = "AnotherJavaDocking";  // UUID for desktopConnection
-    protected String javaWindowName = "Another Java Dock Window";
-
-    protected DesktopConnection desktopConnection;
-    protected ExternalWindowObserver externalWindowObserver;
-
-    private static JFrame jFrame;
-    protected JButton undockButton;
-    protected JTextField dockStatus;  // show Ready to dock message
-
-    public DockingDemo2() {
-        try {
-            this.desktopConnection = new DesktopConnection(appUuid);
-            startOpenFinRuntime();
-        } catch (DesktopException desktopError) {
-            desktopError.printStackTrace();
-        }
-        setLayout(new BorderLayout());
-        add(layoutCenterPanel(), BorderLayout.CENTER);
-        add(layoutLeftPanel(), BorderLayout.WEST);
-        setBorder(BorderFactory.createEmptyBorder(20,20,20,20));
-    }
-
-    private JPanel layoutLeftPanel() {
-        JPanel panel = new JPanel();
-        double size[][] = {{410}, {120, 30, TableLayout.FILL}};
-        panel.setLayout(new TableLayout(size));
-        panel.add(layoutActionButtonPanel(), "0,0,0,0");
-        panel.add(layoutDockStatus(), "0,1,0,1");
-        return panel;
-    }
-
-    private JTextField layoutDockStatus() {
-        this.dockStatus = new JTextField();
-        return this.dockStatus;
-    }
-
-    private JPanel layoutActionButtonPanel() {
-        JPanel buttonPanel = new JPanel();
-        JPanel topPanel = new JPanel();
-        double size[][] = {{10, 190, 20, 190, 10}, {25, 10, 25, 10}};
-        topPanel.setLayout(new TableLayout(size));
-        topPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createBevelBorder(2), "Desktop"));
-        undockButton = new JButton("Undock");
-        undockButton.setActionCommand("undock-window");
-        undockButton.setEnabled(false);
-        topPanel.add(undockButton, "1,0,1,0");
-        undockButton.addActionListener(this);
-        buttonPanel.add(topPanel, "0,0");
-        return buttonPanel;
-    }
-
-    private JPanel layoutCenterPanel() {
-        JPanel panel = new JPanel();
-        double size[][] = {{TableLayout.FILL}, {150, 150, TableLayout.FILL}};
-        panel.setLayout(new TableLayout(size));
-
-        return panel;
-    }
-
-    private void undockFromOtherWindows() {
-        try {
-            // send message to Docking Manager to undock me
-            JSONObject msg = new JSONObject();
-            msg.put("applicationUuid", javaParentAppUuid);
-            msg.put("windowName", javaWindowName);
-            desktopConnection.getInterApplicationBus().publish("undock-window", msg);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        undockButton.setEnabled(false);
-    }
-
-    private void startOpenFinRuntime() {
-        try {
-            DesktopStateListener listener = new DesktopStateListener() {
-                @Override
-                public void onReady() {
-                    onRuntimeReady();
-                }
-
-                @Override
-                public void onClose(String error) {
-                }
-                @Override
-                public void onError(String reason) {
-                    logger.error("Connection failed: " + reason);
-                    java.lang.System.exit(0);
-                }
-                @Override
-                public void onMessage(String message) {
-                }
-                @Override
-                public void onOutgoingMessage(String message) {
-                }
-            };
-            desktopConnection.setAdditionalRuntimeArguments(" --v=1");  // enable additional logging from Runtime
-
-            String desktopVersion = java.lang.System.getProperty("com.openfin.demo.version");
-            if (desktopVersion == null) {
-                desktopVersion = "stable";
-            }
-            desktopConnection.connectToVersion(desktopVersion, listener, 60); // 5.44.10.26 has fix for cross-app docking, which is required for windowsInShameGroupMoveTogether
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    private void onRuntimeReady() {
-        try {
-            this.desktopConnection.getInterApplicationBus().subscribe("*", "window-docked", (uuid, topic, data) -> {
-                JSONObject event = (JSONObject) data;
-                String appUuid = event.getString("applicationUuid");
-                String windowName = event.getString("windowName");
-                if (javaParentAppUuid.equals(appUuid) && javaWindowName.equals(windowName)) {
-                    updateUndockButton(true);
-                }
-            });
-            this.desktopConnection.getInterApplicationBus().subscribe("*", "window-undocked", (uuid, topic, data) -> {
-                JSONObject event = (JSONObject) data;
-                String appUuid = event.getString("applicationUuid");
-                String windowName = event.getString("windowName");
-                if (javaParentAppUuid.equals(appUuid) && javaWindowName.equals(windowName)) {
-                    updateUndockButton(false);
-                }
-            });
-            registerJavaWindow();
-            Application javaParentApp = Application.wrap(javaParentAppUuid, desktopConnection);
-            javaParentApp.addEventListener("closed", actionEvent -> { shutdown(); }, null);
-        } catch (Exception e) {
-            logger.error("Error creating DockingManager", e);
-        }
-    }
-
-    private void registerJavaWindow() {
-        try {
-            externalWindowObserver = new ExternalWindowObserver(desktopConnection.getPort(), javaParentAppUuid, javaWindowName, jFrame,
-                new AckListener() {
-                    @Override
-                    public void onSuccess(Ack ack) {
-                        try {
-                            if (ack.isSuccessful()) {
-                                JSONObject request = new JSONObject();
-                                request.put("applicationUuid", javaParentAppUuid);
-                                request.put("windowName", javaWindowName);
-                                desktopConnection.getInterApplicationBus().publish("register-docking-window", request);
-                            }
-                        } catch (Exception ex) {
-                            logger.error("Error registering window", ex);
-                        }
-                    }
-                    @Override
-                    public void onError(Ack ack) {
-                        logger.error("Error registering java window ", ack.getReason());
-                    }
-                });
-        } catch (Exception e) {
-            logger.error("Error registering external window", e);
-        }
-    }
-
-    public void actionPerformed(java.awt.event.ActionEvent e) {
-        if ("undock-window".equals(e.getActionCommand())) {
-            undockFromOtherWindows();
-        }
-    }
-    private void updateUndockButton(boolean enabled) {
-        this.undockButton.setEnabled(enabled);
-        if (enabled) {
-            this.dockStatus.setText("Docked. Click Unlock button to undock");
-        } else {
-            this.dockStatus.setText("");
-        }
-    }
-
-    private static void createAndShowGUI() {
-        //Create and set up the window.
-        jFrame = new JFrame("Another Java Docking Demo");
-        jFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        //Create and set up the content pane.
-        DockingDemo2 newContentPane = new DockingDemo2();
-        newContentPane.setOpaque(true); //content panes must be opaque
-        jFrame.setContentPane(newContentPane);
-        jFrame.addWindowListener(newContentPane);
-
-        //Display the window.
-        jFrame.pack();
-        jFrame.setSize(470, 300);
-        jFrame.setLocation(600, 400);
-//        jFrame.setLocationRelativeTo(null);
-        jFrame.setResizable(false);
-        jFrame.setVisible(true);
-    }
-
-    private void shutdown() {
-        logger.debug("shutting down");
-        if (externalWindowObserver != null) {
-            logger.debug("Closing");
-            try {
-                JSONObject request = new JSONObject();
-                request.put("applicationUuid", javaParentAppUuid);
-                request.put("windowName", javaWindowName);
-                desktopConnection.getInterApplicationBus().publish("unregister-docking-window", request);
-                Thread.sleep(2000);  // give time to flush messages to Runtime
-                externalWindowObserver.dispose();
-                desktopConnection.disconnect();
-                Thread.sleep(1000);  // give time to flush messages to Runtime
-            } catch (Exception ex) {
-                logger.error("Error existing", ex);
-            }
-        }
-    }
-
-    /**
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                createAndShowGUI();
-            }
-        });
-    }
-
-    @Override
-    public void windowOpened(WindowEvent e) {
-
-    }
-
-    @Override
-    public void windowClosing(WindowEvent e) {
-        shutdown();
-    }
-
-    @Override
-    public void windowClosed(WindowEvent e) {
-
-    }
-
-    @Override
-    public void windowIconified(WindowEvent e) {
-
-    }
-
-    @Override
-    public void windowDeiconified(WindowEvent e) {
-
-    }
-
-    @Override
-    public void windowActivated(WindowEvent e) {
-
-    }
-
-    @Override
-    public void windowDeactivated(WindowEvent e) {
-
-    }
-}
-
-
diff --git a/src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java b/src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java
index 38f3d96..d2a67b6 100644
--- a/src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java
+++ b/src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java
@@ -16,6 +16,7 @@
 import java.util.List;
 
 public class FxLayoutFrame {
+    private static String LayoutServiceChannelName = "of-layouts-service-v1";
     private ExternalWindowObserver externalWindowObserver;
     private String windowName;
     private Stage stage;
@@ -57,7 +58,7 @@ public void run() {
                                 @Override
                                 public void onSuccess(Ack ack) {
                                     ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
-                                    observer.getDesktopConnection().getChannel().connect("of-layouts-service-v1",
+                                    observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
                                             new AsyncCallback<ChannelClient>() {
                                                 @Override
                                                 public void onSuccess(ChannelClient client) {
diff --git a/src/main/java/com/openfin/desktop/demo/JNLPExample.java b/src/main/java/com/openfin/desktop/demo/JNLPExample.java
index ce8a612..646a244 100644
--- a/src/main/java/com/openfin/desktop/demo/JNLPExample.java
+++ b/src/main/java/com/openfin/desktop/demo/JNLPExample.java
@@ -63,7 +63,9 @@ public JNLPExample() throws DesktopException {
         startButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 try {
-                    desktopConnection.connectToVersion("stable", listener, 100000);
+                    RuntimeConfiguration cfg = new RuntimeConfiguration();
+                    cfg.setRuntimeVersion("stable");
+                    desktopConnection.connect(cfg, listener, 30);
                 } catch (Exception ex) {
                     ex.printStackTrace();
                 }
diff --git a/src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java b/src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java
index 8801a4f..32e7bee 100644
--- a/src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java
+++ b/src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java
@@ -25,6 +25,7 @@ public class LaunchManifestDemo extends Application implements DesktopStateListe
     private final static Logger logger = LoggerFactory.getLogger(LaunchManifestDemo.class.getName());
     private final static String WINDOW_TITLE = "Launch Manifest Demo";
 
+    private static String LayoutServiceChannelName = "of-layouts-service-v1";
     private static String appUuid = "LaunchManifestDemo";  // App UUID for startup app in manifest
     private final static String javaConnectUuid = "LaunchManifestDemo-Java"; // connection UUID for Java app
     private DesktopConnection desktopConnection;
@@ -175,7 +176,7 @@ private void createExternalWindowObserver() {
                         @Override
                         public void onSuccess(Ack ack) {
                             ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
-                            observer.getDesktopConnection().getChannel().connect("of-layouts-service-v1",
+                            observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
                                     new AsyncCallback<ChannelClient>() {
                                         @Override
                                         public void onSuccess(ChannelClient client) {
@@ -183,7 +184,7 @@ public void onSuccess(ChannelClient client) {
 
                                             client.register("event", new ChannelAction() {
                                                 @Override
-                                                public JSONObject invoke(String action, JSONObject payload) {
+                                                public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
                                                     System.out.printf("channel event " + action);
                                                     return null;
                                                 }
diff --git a/src/main/java/com/openfin/desktop/demo/LauncherBusDemo.java b/src/main/java/com/openfin/desktop/demo/LauncherBusDemo.java
index ea4e050..58d2cf3 100644
--- a/src/main/java/com/openfin/desktop/demo/LauncherBusDemo.java
+++ b/src/main/java/com/openfin/desktop/demo/LauncherBusDemo.java
@@ -9,8 +9,6 @@
 import com.openfin.desktop.*;
 import com.openfin.desktop.Window;
 import com.openfin.desktop.channel.*;
-import com.openfin.desktop.channel.NotificationListener;
-import com.openfin.desktop.channel.NotificationOptions;
 import com.openfin.desktop.win32.ExternalWindowObserver;
 import com.sun.jna.Native;
 import info.clearthought.layout.TableLayout;
@@ -30,13 +28,13 @@ public class LauncherBusDemo extends JFrame {
 
     private DesktopConnection desktopConnection;
     private InterApplicationBus interApplicationBus;
-    private NotificationClient notificationClient;
     private JButton btnOFApp1, btnOFApp2;
-    private JButton btnNotification, btnToggleNotification;   // button to create notifications
+    private JButton btnTabOFApp1;
     private JButton btnUndock;   // button to undock this Java window
     private JButton btnOFSendApp1, btnOFSendApp2;  // send messages to OpenFin app via Inter App Bus
     private JButton btnGenerateWorkSpace, btnRestoreWorkSpace;
-    private static String appUuid = "LaunchManifestDemo";  // App UUID for startup app in manifest
+    private static String appStartupUuid = "LaunchManifestDemo";  // App UUID for startup app in startup manifest
+    private static String javaWindowName = appStartupUuid + "-Java-Window";  // name of this Java window registered with Runtime
     private final String app1Uuid = "Layout Client1";       // defined in layoutclient1.json
     private final String app2Uuid = "Layout Client2";       // defined in layoutclient2.json
     private final String appUrl = "http://localhost:8888/busdemo.html";
@@ -61,6 +59,17 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
             }
         });
 
+        btnTabOFApp1 = new JButton();
+        btnTabOFApp1.setEnabled(false);
+        btnTabOFApp1.setText("Tab to OpenFin app1");
+        btnTabOFApp1.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(java.awt.event.ActionEvent e) {
+                // uuid and name from http://localhost:8888/layoutclient1.json
+                tabToWindow("Layout Client1", "Layout Client1");
+            }
+        });
+
         btnOFApp2 = new JButton();
         btnOFApp2.setEnabled(false);
         btnOFApp2.setText("Launch OpenFin App2");
@@ -91,26 +100,6 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
             }
         });
 
-        btnNotification = new JButton();
-        btnNotification.setText("Notification");
-        btnNotification.setEnabled(false);
-        btnNotification.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(java.awt.event.ActionEvent e) {
-                createNotification();
-            }
-        });
-
-        btnToggleNotification = new JButton();
-        btnToggleNotification.setText("Toggle Notification CENTER");
-        btnToggleNotification.setEnabled(false);
-        btnToggleNotification.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(java.awt.event.ActionEvent e) {
-                toggleNotificationCenter();
-            }
-        });
-
         btnGenerateWorkSpace = new JButton();
         btnGenerateWorkSpace.setText("Generate WorkSpace");
         btnGenerateWorkSpace.setEnabled(false);
@@ -136,18 +125,17 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
         btnUndock.setEnabled(false);
 
         JPanel topPanel = new JPanel();
-        double size[][] = {{10, 190}, {25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5}};
+        double size[][] = {{10, 190}, {25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5, 25, 5}};
         topPanel.setLayout(new TableLayout(size));
 
         topPanel.add(btnOFApp1, "1,0,1,0");
-        topPanel.add(btnOFApp2, "1,2,1,2");
-        topPanel.add(btnOFSendApp1, "1,4,1,4");
-        topPanel.add(btnOFSendApp2, "1,6,1,6");
-        topPanel.add(btnNotification, "1,8,1,8");
-        topPanel.add(btnToggleNotification, "1,10,1,10");
-        topPanel.add(btnGenerateWorkSpace, "1,12,1,12");
-        topPanel.add(btnRestoreWorkSpace, "1,14,1,14");
-        topPanel.add(btnUndock, "1,16,1,16");
+        topPanel.add(btnTabOFApp1, "1,2,1,2");
+        topPanel.add(btnOFApp2, "1,4,1,4");
+        topPanel.add(btnOFSendApp1, "1,6,1,6");
+        topPanel.add(btnOFSendApp2, "1,8,1,8");
+        topPanel.add(btnGenerateWorkSpace, "1,14,1,14");
+        topPanel.add(btnRestoreWorkSpace, "1,16,1,16");
+        topPanel.add(btnUndock, "1,18,1,18");
 
         setLayout(new BorderLayout());
         add(topPanel, BorderLayout.NORTH);
@@ -199,7 +187,7 @@ private void launchRuntime() {
             sfeatures.put("tab", true);
             scfg.put("features", sfeatures);
             layout.put("config", scfg);
-            layout.put("manifestUrl", "https://cdn.openfin.co/services/openfin/layouts/1.0.0/app.json");
+//            layout.put("manifestUrl", "https://cdn.openfin.co/services/openfin/layouts/1.0.0/app.json");
             serviceConfig.put(0, layout);
 
             JSONObject notification = new JSONObject();
@@ -209,8 +197,8 @@ private void launchRuntime() {
             cfg.addConfigurationItem("services", serviceConfig);
 
             JSONObject startupApp = new JSONObject();
-            startupApp.put("uuid", appUuid);
-            startupApp.put("name", appUuid);
+            startupApp.put("uuid", appStartupUuid);
+            startupApp.put("name", appStartupUuid);
             startupApp.put("url", "about:blank");
             startupApp.put("autoShow", false);
             cfg.setStartupApp(startupApp);
@@ -223,11 +211,11 @@ public void onReady() {
                         logger.info("Connected to OpenFin Runtime");
                         interApplicationBus = new InterApplicationBus(desktopConnection);
                         btnOFApp1.setEnabled(true);
+                        btnTabOFApp1.setEnabled(true);
                         btnOFApp2.setEnabled(true);
                         configAppEventListener();
                         createEmbddedApp();
                         createLayoutClient();
-                        createNotificationClient();
                     }
 
                     @Override
@@ -300,24 +288,23 @@ private void createExternalWindowObserver() {
             // only needs to happen once
             return;
         }
-        String windowName = appUuid + "-Java-Window";
         try {
             // ExternalWindowObserver forwards window events to Runtime & Layout Service.  Currently ExternalWindowObserver requires UUID of an
             // existing OpenFin app.  So here we are using UUID of the startup app in manifest.
-            this.externalWindowObserver = new ExternalWindowObserver(desktopConnection.getPort(), appUuid, windowName, this,
+            this.externalWindowObserver = new ExternalWindowObserver(desktopConnection.getPort(), appStartupUuid, javaWindowName, this,
                     new AckListener() {
                         @Override
                         public void onSuccess(Ack ack) {
                             btnUndock.addActionListener(new ActionListener() {
                                 @Override
                                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                                    LauncherBusDemo.this.layoutClient.undockWindow(appUuid, windowName, null);
+                                    LauncherBusDemo.this.layoutClient.undockWindow(appStartupUuid, javaWindowName, null);
                                 }
                             });
                         }
                         @Override
                         public void onError(Ack ack) {
-                            System.out.println(windowName + ": unable to register external window, " + ack.getReason());
+                            System.out.println(javaWindowName + ": unable to register external window, " + ack.getReason());
                         }
                     });
         } catch (Exception ex) {
@@ -326,7 +313,7 @@ public void onError(Ack ack) {
 
         // when this Java window is docked or undocked by layout service, "group-changed" is fired.
         // calling getGroup to determine if btnUndock should enabled.
-        Window w = Window.wrap(appUuid, windowName, desktopConnection);
+        Window w = Window.wrap(appStartupUuid, javaWindowName, desktopConnection);
         w.addEventListener("group-changed", new EventListener() {
             @Override
             public void eventReceived(com.openfin.desktop.ActionEvent actionEvent) {
@@ -454,47 +441,6 @@ public void onError(Ack ack) {
             }
         });
     }
-    private void createNotificationClient() {
-        this.notificationClient = new NotificationClient(this.desktopConnection, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                btnNotification.setEnabled(true);
-                btnToggleNotification.setEnabled(true);
-                LauncherBusDemo.this.notificationClient.addNotificationListener(new NotificationListener() {
-                    @Override
-                    public void onClick(NotificationOptions options) {
-                        logger.info(String.format("Notification clicked %s", options.getId()));
-                    }
-                    @Override
-                    public void onButtonClick(NotificationOptions options) {
-                        logger.info(String.format("Notification button clicked %s button index %d", options.getId(),
-                                    options.getButtonIndex()));
-                    }
-                    @Override
-                    public void onClose(NotificationOptions options) {
-                        logger.info(String.format("Notification closed %s", options.getId()));
-                    }
-                });
-            }
-            @Override
-            public void onError(Ack ack) {
-
-            }
-        });
-    }
-    private void createNotification() {
-        NotificationOptions options = new NotificationOptions();
-        options.setId(UUID.randomUUID().toString());
-        options.setBody("Hello From Java app");
-        options.setTitle("Java Demo");
-        options.setIcon("https://openfin.co/favicon.ico");
-        options.addButton(null, "button1");
-        options.addButton(null, "button2");
-        this.notificationClient.create(options, null);
-    }
-    private void toggleNotificationCenter() {
-        this.notificationClient.toggleNotificationCenter(null);
-    }
 
     private void generateWorkSpace() {
         this.layoutClient.generateWorkspace(new AsyncCallback<JSONObject>() {
@@ -530,14 +476,36 @@ public void onError(Ack ack) {
         }
     }
 
+    /**
+     * Tab this Java window to an OpenFin windowq
+     * @param appUuid
+     * @param windowName
+     */
+    public void tabToWindow(String appUuid, String windowName) {
+        WindowIdentity target = new WindowIdentity();
+        target.setUuid(appUuid);
+        target.setName(windowName);
+        WindowIdentity me = new WindowIdentity();
+        // this Java window is registered as appStartupUuid/javaWindowName, as in createExternalWindowObserver
+        me.setUuid(appStartupUuid);
+        me.setName(javaWindowName);
+        this.layoutClient.tabWindows(target, me, null);
+    }
+
     public void cleanup() {
         try {
             if (this.externalWindowObserver != null) {
                 this.externalWindowObserver.dispose();
             }
             if (this.desktopConnection != null) {
-                OpenFinRuntime runtime = new OpenFinRuntime(desktopConnection);
-                runtime.exit();
+                // shut down startup app
+                Application app = Application.wrap(appStartupUuid, desktopConnection);
+                app.close(true, null);
+
+                Application app2 = Application.wrap(embedUuid, desktopConnection);
+                app2.close(true, null);
+
+                this.desktopConnection.disconnect();
                 Thread.sleep(1000);
                 java.lang.System.exit(0);
             }
diff --git a/src/main/java/com/openfin/desktop/demo/LayoutFrame.java b/src/main/java/com/openfin/desktop/demo/LayoutFrame.java
index 06a44a8..93cc75f 100644
--- a/src/main/java/com/openfin/desktop/demo/LayoutFrame.java
+++ b/src/main/java/com/openfin/desktop/demo/LayoutFrame.java
@@ -25,7 +25,9 @@
 import java.lang.System;
 
 public class LayoutFrame extends JFrame {
+	private static String LayoutServiceChannelName = "of-layouts-service-v1";
 	private ExternalWindowObserver externalWindowObserver;
+	private JLabel labelName;
 	private JButton btnUndock;
 	private String windowName;
 	private ChannelClient channelClient;
@@ -38,18 +40,22 @@ public LayoutFrame(DesktopConnection desktopConnection, String appUuid, String w
 	
 	public LayoutFrame(DesktopConnection desktopConnection, String appUuid, String windowName, boolean frameless) throws DesktopException {
 		super();
+		this.setTitle(windowName);
 		System.out.println(windowName + " being created ");
 		this.appUuid = appUuid;
 		this.windowName = windowName;
 		this.frameless = frameless;
 		this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		this.setPreferredSize(new Dimension(640, 480));
-		JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
+		JPanel pnl = new JPanel();
+		pnl.setLayout(new BoxLayout(pnl, BoxLayout.Y_AXIS));
+		this.labelName = new JLabel(windowName);
+		pnl.add(labelName);
 		this.btnUndock = new JButton("undock");
 		this.btnUndock.setEnabled(false);
 		pnl.add(btnUndock);
 		this.getContentPane().add(pnl);
-		
+
 		if (frameless) {
 			this.setUndecorated(true);
 			JPanel titleBar = new JPanel(new BorderLayout());
@@ -61,15 +67,25 @@ public void mousePressed(MouseEvent e) {
 					pressedAtX = e.getX();
 					pressedAtY = e.getY();
 					System.out.println("mouse pressed at x=" + pressedAtX + ", y=" + pressedAtY);
+					LayoutFrame.this.externalWindowObserver.enterSizeMove();
 				}
-
 				@Override
 				public void mouseDragged(MouseEvent e) {
 					int distanceX = e.getX() - pressedAtX;
 					int distanceY = e.getY() - pressedAtY;
 					System.out.println("dragged x=" + distanceX + ", y=" + distanceY);
 					Point frameLocation = LayoutFrame.this.getLocation();
-					LayoutFrame.this.setLocation(frameLocation.x + distanceX, frameLocation.y + distanceY);
+					Dimension dimension = LayoutFrame.this.getSize();
+					WindowBounds bounds = new WindowBounds(frameLocation.x + distanceX, frameLocation.y + distanceY,
+							dimension.width, dimension.height);
+					Point point = new Point(e.getX(), e.getY());
+					if (!LayoutFrame.this.externalWindowObserver.onMoving(bounds, point)) {
+						LayoutFrame.this.setLocation(frameLocation.x + distanceX, frameLocation.y + distanceY);
+					}
+				}
+				@Override
+				public void mouseReleased(MouseEvent e) {
+					LayoutFrame.this.externalWindowObserver.exitSizeMove();
 				}
 			};
 			titleBar.addMouseListener(myListener);
@@ -97,7 +113,7 @@ public void actionPerformed(ActionEvent e) {
 					@Override
 					public void onSuccess(Ack ack) {
 						ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
-						observer.getDesktopConnection().getChannel().connect("of-layouts-service-v1",
+						observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
 								new AsyncCallback<ChannelClient>() {
 									@Override
 									public void onSuccess(ChannelClient client) {
@@ -114,7 +130,7 @@ public void actionPerformed(ActionEvent e) {
 
 										client.register("event", new ChannelAction() {
 											@Override
-											public JSONObject invoke(String action, JSONObject payload) {
+											public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
 												System.out.printf("channel event " + action);
 												return null;
 											}
@@ -128,13 +144,13 @@ public void onError(Ack ack) {
 						System.out.println(windowName + ": unable to register external window, " + ack.getReason());
 					}
 				});
-		this.externalWindowObserver.setUserGesture(!this.frameless);
+//		this.externalWindowObserver.setUserGesture(!this.frameless);
 		try {
-			if (this.frameless) {
-				WindowOptions options = new WindowOptions();
-				options.setFrame(false);
-				this.externalWindowObserver.setWindowOptions(options);
-			}
+//			if (this.frameless) {
+//				WindowOptions options = new WindowOptions();
+//				options.setFrame(false);
+//				this.externalWindowObserver.setWindowOptions(options);
+//			}
 			this.externalWindowObserver.start();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -256,7 +272,6 @@ public void mousePressed(MouseEvent e) {
 				pressedAtY = e.getY();
 				System.out.println("mouse pressed at x=" + pressedAtX + ", y=" + pressedAtY);
 			}
-
 			@Override
 			public void mouseDragged(MouseEvent e) {
 				int distanceX = e.getX() - pressedAtX;
@@ -265,6 +280,12 @@ public void mouseDragged(MouseEvent e) {
 				Point frameLocation = frame.getLocation();
 				frame.setLocation(frameLocation.x + distanceX, frameLocation.y + distanceY);
 			}
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				pressedAtX = e.getX();
+				pressedAtY = e.getY();
+				System.out.println("mouse released at x=" + pressedAtX + ", y=" + pressedAtY);
+			}
 		};
 		titleBar.addMouseListener(myListener);
 		titleBar.addMouseMotionListener(myListener);
diff --git a/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java b/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
index fc4ae3a..b22ac8a 100644
--- a/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
+++ b/src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
@@ -159,18 +159,18 @@ void launchOpenfin() throws DesktopException, DesktopIOException, IOException, I
 		if (rvm != null) {
 			config.setLaunchRVMPath(rvm);
 		}
-		config.setRuntimeVersion("9.61.38.40");
-		config.setAdditionalRuntimeArguments("--v=1 --remote-debugging-port=9090 ");
+		config.setRuntimeVersion("alpha");
+		config.setAdditionalRuntimeArguments("--v=1 ");
 		serviceConfig = new JSONArray();
 		JSONObject layout = new JSONObject();
 		layout.put("name", "layouts");
+//		layout.put("manifestUrl", "http://localhost:8081/app3.json");
 		JSONObject scfg = new JSONObject();
 		JSONObject sfeatures = new JSONObject();
 		sfeatures.put("dock", true);
 		sfeatures.put("tab", true);
 		scfg.put("features", sfeatures);
 		layout.put("config", scfg);
-		layout.put("manifestUrl", "https://cdn.openfin.co/services/openfin/layouts/1.0.0/app.json");
 		serviceConfig.put(0, layout);
 		config.addConfigurationItem("services", serviceConfig);
 
diff --git a/src/main/java/com/openfin/desktop/demo/MemoryProfile.java b/src/main/java/com/openfin/desktop/demo/MemoryProfile.java
new file mode 100644
index 0000000..0b22811
--- /dev/null
+++ b/src/main/java/com/openfin/desktop/demo/MemoryProfile.java
@@ -0,0 +1,96 @@
+package com.openfin.desktop.demo;
+
+import com.openfin.desktop.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+/**
+ *  This class can be used to profile memory usage of Java Adapter for communicating with Runtime.  The initial version
+ *  just keeps calling getMachineId API.  It can easily extended to test other APIs.
+ *
+ *  VisualVM, available from https://visualvm.github.io/, can be used to monitor memory usgage while this code is running
+ */
+
+public class MemoryProfile {
+    private final static Logger logger = LoggerFactory.getLogger(MemoryProfile.class.getName());
+
+    public static void main(String[] args) {
+        RuntimeConfiguration runtimeConfiguration = new RuntimeConfiguration();
+        String connectionUuid = MemoryProfile.class.getName();
+        String desktopVersion = java.lang.System.getProperty("com.openfin.demo.version");
+        if (desktopVersion == null) {
+            desktopVersion = "stable";
+        }
+        runtimeConfiguration.setRuntimeVersion(desktopVersion);
+        try {
+            final DesktopConnection desktopConnection = new DesktopConnection(connectionUuid);
+            DesktopStateListener listener = new DesktopStateListener() {
+                @Override
+                public void onReady() {
+                    launchThread(desktopConnection);
+                }
+                @Override
+                public void onClose(String error) {
+
+                }
+                @Override
+                public void onError(String reason) {
+                    logger.error(String.format("onError %s", reason));
+                }
+
+                @Override
+                public void onMessage(String message) {
+                }
+                @Override
+                public void onOutgoingMessage(String message) {
+                }
+            };
+            desktopConnection.connect(runtimeConfiguration, listener, 50);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    private static void launchThread(DesktopConnection desktopConnection) {
+        Thread t = new Thread() {
+            @Override
+            public void run() {
+                OpenFinRuntime openfinSystem = new OpenFinRuntime(desktopConnection);
+                AtomicInteger callCount = new AtomicInteger();
+                AtomicBoolean shouldRun = new AtomicBoolean(true);
+                while (shouldRun.get()) {
+                    try {
+                        CountDownLatch latch = new CountDownLatch(1);
+                        openfinSystem.getMachineId(new AckListener() {
+                            @Override
+                            public void onSuccess(Ack ack) {
+                                if (ack.isSuccessful()) {
+                                    logger.info(String.format("API call count %d", callCount.incrementAndGet()));
+                                    latch.countDown();
+                                } else {
+                                    logger.error(String.format("API failed %s", ack.getReason()));
+                                    shouldRun.set(false);
+                                }
+                            }
+                            @Override
+                            public void onError(Ack ack) {
+                                logger.error(String.format("API failed %s", ack.getReason()));
+                                shouldRun.set(false);
+                            }
+                        });
+                        latch.await(1, TimeUnit.SECONDS);
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+                }
+            }
+        };
+        t.start();
+    }
+}
diff --git a/src/main/java/com/openfin/desktop/demo/NoGui.java b/src/main/java/com/openfin/desktop/demo/NoGui.java
index 9b9d625..3076fff 100644
--- a/src/main/java/com/openfin/desktop/demo/NoGui.java
+++ b/src/main/java/com/openfin/desktop/demo/NoGui.java
@@ -76,7 +76,9 @@ public void onOutgoingMessage(String message) {
                     System.out.println("Main.onOutgoingMessage");
                 }
             };
-            desktopConnection.connectToVersion("6.49.12.17", listener, 5000);
+            RuntimeConfiguration cfg = new RuntimeConfiguration();
+            cfg.setRuntimeVersion("stable");
+            desktopConnection.connect(cfg, listener, 50);
 
             try {
                 // keep Runtime running for 10 seconds
diff --git a/src/main/java/com/openfin/desktop/demo/NotificationServiceDemo.java b/src/main/java/com/openfin/desktop/demo/NotificationServiceDemo.java
new file mode 100644
index 0000000..30d5c3f
--- /dev/null
+++ b/src/main/java/com/openfin/desktop/demo/NotificationServiceDemo.java
@@ -0,0 +1,269 @@
+package com.openfin.desktop.demo;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.util.Date;
+import java.util.UUID;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+import org.json.JSONObject;
+
+import com.openfin.desktop.DesktopConnection;
+import com.openfin.desktop.DesktopException;
+import com.openfin.desktop.DesktopIOException;
+import com.openfin.desktop.DesktopStateListener;
+import com.openfin.desktop.RuntimeConfiguration;
+import com.openfin.desktop.notifications.ButtonOptions;
+import com.openfin.desktop.notifications.NotificationActionResult;
+import com.openfin.desktop.notifications.NotificationIndicator;
+import com.openfin.desktop.notifications.NotificationOptions;
+import com.openfin.desktop.notifications.Notifications;
+import com.openfin.desktop.notifications.events.NotificationActionEvent;
+
+public class NotificationServiceDemo {
+	
+	private JFrame demoWindow;
+	private DesktopConnection desktopConnection;
+	private JPanel glassPane;
+	private Notifications notifications;
+	
+	public NotificationServiceDemo() {
+		this.demoWindow = new JFrame("OpenFin Notification Service Demo");
+		this.demoWindow.setContentPane(this.createContentPanel());
+		this.demoWindow.setGlassPane(this.createGlassPane());
+		this.demoWindow.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		this.demoWindow.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				if (desktopConnection != null) {
+					try {
+						desktopConnection.disconnect();
+					}
+					catch (DesktopException e1) {
+						e1.printStackTrace();
+					}
+				}
+			}
+		});
+		
+		this.demoWindow.pack();
+		this.demoWindow.setLocationRelativeTo(null);
+		this.demoWindow.setVisible(true);
+		this.glassPane.setVisible(true);
+		this.initOpenFin();
+	}
+	
+	private void initOpenFin() {
+		try {
+			this.desktopConnection = new DesktopConnection("OpenFin Notification Service Demo");
+			RuntimeConfiguration config = new RuntimeConfiguration();
+			config.setRuntimeVersion("stable");
+			this.desktopConnection.connect(config, new DesktopStateListener() {
+
+				@Override
+				public void onReady() {
+					notifications = new Notifications(desktopConnection);
+					
+					
+					notifications.addEventListener(Notifications.EVENT_TYPE_ACTION, ne ->{
+						NotificationActionEvent actionEvent = (NotificationActionEvent) ne;
+						NotificationActionResult actionResult = actionEvent.getResult();
+						System.out.println("actionResult: notificationId: " + actionEvent.getNotificationOptions().getId() + ", user clicked on btn: " + actionResult.getString("btn"));
+					});
+
+					SwingUtilities.invokeLater(()->{
+						glassPane.setVisible(false);
+					});
+				}
+
+				@Override
+				public void onClose(String error) {
+					System.exit(0);
+				}
+
+				@Override
+				public void onError(String reason) {
+					
+				}
+
+				@Override
+				public void onMessage(String message) {
+					
+				}
+
+				@Override
+				public void onOutgoingMessage(String message) {
+					
+				}
+				
+			}, 60);
+			
+		}
+		catch (DesktopException | DesktopIOException | IOException e) {
+			e.printStackTrace();
+		}
+		finally {
+			
+		}
+	}
+	
+	private JPanel createGlassPane() {
+		this.glassPane = new JPanel(new BorderLayout());
+		JLabel l = new JLabel("Loading, please wait......");
+		l.setHorizontalAlignment(JLabel.CENTER);
+		this.glassPane.add(l, BorderLayout.CENTER);
+		this.glassPane.setBackground(Color.LIGHT_GRAY);
+		return this.glassPane;
+	}
+	
+	
+	private JPanel createToggleNotificationCenterPanel() {
+		JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
+		pnl.setBorder(BorderFactory.createTitledBorder("Notification Center"));
+		JButton btnToggleNotificationCenter = new JButton("Toggle Notification Center");
+		btnToggleNotificationCenter.addActionListener(e->{
+			this.notifications.toggleNotificationCenter();
+		});
+		JButton btnClearAll = new JButton("Clear All");
+		btnClearAll.addActionListener(e->{
+			this.notifications.clearAll();
+		});
+		pnl.add(btnToggleNotificationCenter);
+		pnl.add(btnClearAll);
+		return pnl;
+	}
+	
+	private JPanel createCreateNotificationPanel() {
+		JPanel pnl = new JPanel(new BorderLayout());
+		pnl.setBorder(BorderFactory.createTitledBorder("Notification"));
+		
+		JTextField tfTitle = new JTextField("Title");
+		JTextField tfBody = new JTextField("Body");
+		JTextField tfCategory = new JTextField("Category");
+		JTextField tfIcon = new JTextField("https://openfin.co/favicon-32x32.png");
+		JTextField tfIndicatorText = new JTextField("Hello From Java");
+		JTextField tfExpiresInSecs = new JTextField("60");
+		
+		JComboBox<String> cbSticky = new JComboBox<>();
+		cbSticky.addItem(NotificationOptions.STICKY_STICKY);
+		cbSticky.addItem(NotificationOptions.STICKY_TRANSIENT);
+
+		JComboBox<String> cbIndicator = new JComboBox<>();
+		cbIndicator.addItem(NotificationIndicator.TYPE_FAILURE);
+		cbIndicator.addItem(NotificationIndicator.TYPE_WARNING);
+		cbIndicator.addItem(NotificationIndicator.TYPE_SUCCESS);
+		cbIndicator.setSelectedIndex(2);
+		
+		JPanel pnlCenter = new JPanel(new GridBagLayout());
+		GridBagConstraints gbConst = new GridBagConstraints();
+		gbConst.gridx = 0;
+		gbConst.gridy = 0;
+		gbConst.weightx = 0;
+		gbConst.insets = new Insets(5, 5, 5, 5);
+		gbConst.anchor = GridBagConstraints.EAST;
+		pnlCenter.add(new JLabel("Title"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Body"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Category"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Icon"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Sticky"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Indicator"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Indicator Text"), gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel("Expires (in seconds)"), gbConst);
+		gbConst.gridx = 1;
+		gbConst.gridy = 0;
+		gbConst.weightx = 0.5;
+		gbConst.insets = new Insets(5, 0, 5, 5);
+		gbConst.fill = GridBagConstraints.BOTH;
+		pnlCenter.add(tfTitle, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(tfBody, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(tfCategory, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(tfIcon, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(cbSticky, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(cbIndicator, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(tfIndicatorText, gbConst);
+		gbConst.gridy++;
+		pnlCenter.add(tfExpiresInSecs, gbConst);
+		gbConst.weighty = 0.5;
+		gbConst.gridy++;
+		pnlCenter.add(new JLabel(), gbConst);
+		
+		
+		JButton btnCreate = new JButton("Create Notification");
+		btnCreate.addActionListener(e->{
+			NotificationOptions opt = new NotificationOptions(tfTitle.getText(), tfBody.getText(), tfCategory.getText());
+			String icon = tfIcon.getText().trim();
+			if (!icon.isEmpty()) {
+				opt.setIcon(icon);
+			}
+			opt.setSticky((String) cbSticky.getSelectedItem());
+			NotificationIndicator indicatorOpts = new NotificationIndicator((String) cbIndicator.getSelectedItem());
+			String indicatorText = tfIndicatorText.getText().trim();
+			if (!indicatorText.isEmpty()) {
+				indicatorOpts.setText(indicatorText);
+			}
+			opt.setIndicator(indicatorOpts);
+
+			String expires = tfExpiresInSecs.getText().trim();
+			if (!expires.isEmpty()) {
+				opt.setExpires(new Date(System.currentTimeMillis() + (1000 * (Integer.parseInt(expires)))));
+			}
+			
+			ButtonOptions bo1 = new ButtonOptions("Button 1");
+			bo1.setOnClick(new NotificationActionResult(new JSONObject().put("btn", "btn1")));
+			ButtonOptions bo2 = new ButtonOptions("Button 2");
+			bo2.setOnClick(new NotificationActionResult(new JSONObject().put("btn", "btn2")));
+			bo2.setCta(true);
+			opt.setButtons(bo1, bo2);
+			
+			this.notifications.create(opt);
+		});
+		JPanel pnlBottom = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+		pnlBottom.add(btnCreate);
+		pnl.add(pnlCenter, BorderLayout.CENTER);
+		pnl.add(pnlBottom, BorderLayout.SOUTH);
+		return pnl;
+	}
+	
+	private JPanel createContentPanel() {
+		JPanel p = new JPanel(new BorderLayout());
+		p.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+		p.setPreferredSize(new Dimension(550, 400));
+		p.add(this.createToggleNotificationCenterPanel(), BorderLayout.NORTH);
+		p.add(this.createCreateNotificationPanel(), BorderLayout.CENTER);
+		return p;
+	}
+	
+	public static void main(String[] args) {
+		new NotificationServiceDemo();
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
index 0ae8ae2..d849a82 100644
--- a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
+++ b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -6,6 +6,9 @@
 import com.openfin.desktop.animation.AnimationTransitions;
 import com.openfin.desktop.animation.OpacityTransition;
 import com.openfin.desktop.animation.PositionTransition;
+import com.openfin.desktop.notifications.*;
+import com.openfin.desktop.notifications.NotificationOptions;
+import com.openfin.desktop.notifications.events.NotificationActionEvent;
 import info.clearthought.layout.TableLayout;
 
 import javax.swing.*;
@@ -19,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import jdk.nashorn.internal.scripts.JO;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +67,7 @@ public class OpenFinDesktopDemo extends JPanel implements ActionListener, Window
 
     protected JButton createApplication;
     protected JButton createNotification;
+    private Notifications notifications;
 
     protected JList activeApplications;
     protected java.util.List<ApplicationOptions> appOptionsList;
@@ -134,15 +140,52 @@ private void initDesktopConnection() throws DesktopException {
             updateMessagePanel("Additional RVM arguments: " + rvmArgs);
             this.runtimeConfiguration.setAdditionalRvmArguments(rvmArgs);
         }
-        this.runtimeConfiguration.setAdditionalRuntimeArguments("--v=1 ");  // enable additional logging
+        this.runtimeConfiguration.setAdditionalRuntimeArguments("--v=1  ");  // enable additional logging
         this.runtimeConfiguration.setDevToolsPort(9090);
-        this.runtimeConfiguration.setLicenseKey("my-license-key");
+
+        JSONObject startupApp = new JSONObject();
+        startupApp.put("uuid", "DEMO-JAVA");
+        startupApp.put("name", "DEMO-JAVA");
+        startupApp.put("url", "https://cdn.openfin.co/process-manager/index.html");
+        startupApp.put("autoShow", true);
+
+        String licenseKey = java.lang.System.getProperty("com.openfin.demo.licenseKey");
+        if (licenseKey != null) {
+            this.runtimeConfiguration.setLicenseKey(licenseKey);
+        }
         JSONObject myconfig = new JSONObject();
-        myconfig.put("key1", "value1");
-        myconfig.put("PI", 3.14);
+//        this.runtimeConfiguration.setManifestLocation("https://cdn.openfin.co/process-manager/app.json");
+//        myconfig.put("key1", "value1");
+//        myconfig.put("PI", 3.14);
         this.runtimeConfiguration.addConfigurationItem("myconfig", myconfig);
     }
 
+    private void addCustomConfig(JSONObject startupApp) {
+        JSONObject defaultDomainSettings = new JSONObject();
+        JSONArray rules = new JSONArray();
+        JSONObject rule1 = new JSONObject();
+        JSONArray matchList = new JSONArray();
+        matchList.put("*/*.example.com");
+        rule1.put("match", matchList);
+        JSONObject options = new JSONObject();
+        JSONObject downloadSettings = new JSONObject();
+        JSONArray downloadSettingsRules = new JSONArray();
+        JSONObject downloadSettingsRule1 = new JSONObject();
+        JSONArray matchList1 = new JSONArray();
+        matchList1.put("*://*/*.png");
+        matchList1.put("*://*/*.jpg");
+        downloadSettingsRule1.put("match", matchList1);
+        downloadSettingsRule1.put("behavior", "no-prompt");
+        downloadSettingsRules.put(downloadSettingsRule1);
+        downloadSettings.put("rules", downloadSettingsRules);
+        options.put("downloadSettings", downloadSettings);
+        rule1.put("options", options);
+        rules.put(rule1);
+        defaultDomainSettings.put("rules", rules);
+        startupApp.put("defaultDomainSettings", defaultDomainSettings);
+        this.runtimeConfiguration.setStartupApp(startupApp);
+    }
+
     private JPanel layoutLeftPanel() {
         JPanel panel = new JPanel();
         double size[][] = {{TableLayout.FILL}, {160, 30, TableLayout.FILL}};
@@ -451,6 +494,14 @@ private void createAdminApplication() throws DesktopException {
         updateMessagePanel("Creating InterAppBus");
         bus = desktopConnection.getInterApplicationBus();
         openfinSystem = new System(desktopConnection);
+
+        this.notifications = new Notifications(desktopConnection);
+        this.notifications.addEventListener(Notifications.EVENT_TYPE_ACTION, ne ->{
+            NotificationActionEvent actionEvent = (NotificationActionEvent) ne;
+            NotificationActionResult actionResult = actionEvent.getResult();
+            java.lang.System.out.println("actionResult: notificationId: " + actionEvent.getNotificationOptions().getId() + ", user clicked on btn: " + actionResult.getString("btn"));
+        });
+
         updateMessagePanel("Connected to Desktop");
         setMainButtonsEnabled(true);
 
@@ -520,12 +571,12 @@ public void onError(String reason) {
 
             @Override
             public void onMessage(String message) {
-                updateMessagePanel("-->FROM DESKTOP-" + message);
+//                updateMessagePanel("-->FROM DESKTOP-" + message);
             }
 
             @Override
             public void onOutgoingMessage(String message) {
-                updateMessagePanel("<--TO DESKTOP-" + message);
+//                updateMessagePanel("<--TO DESKTOP-" + message);
             }
         };
 
@@ -616,51 +667,24 @@ public void onError(Ack ack) {
     }
 
     private void createNotification() throws Exception {
-        NotificationOptions options = new NotificationOptions("http://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/views/notification.html");
-        options.setTimeout(5000);
-        options.setMessageText("Unit test for notification");
-        new Notification(options, new NotificationListener() {
-            @Override
-            public void onClick(Ack ack) {
-                logger.debug("onClick for notification");
-            }
-            @Override
-            public void onClose(Ack ack) {
-                logger.debug("onClose for notification");
-            }
-            @Override
-            public void onDismiss(Ack ack) {
-                logger.debug("onDismiss for notification");
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error("onError for notification");
-            }
-            @Override
-            public void onMessage(Ack ack) {
-                logger.debug("onMessage for notification");
-            }
-            @Override
-            public void onShow(Ack ack) {
-                // Known issue: this event is not being fired.
-                // logger.debug("onShow for notification");
-            }
-        }, desktopConnection, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(ack.getReason());
-            }
-        });
+        NotificationOptions opt = new NotificationOptions("Notification from Java", "Write once, run everywhere", "Category");
+        opt.setSticky(NotificationOptions.STICKY_STICKY);
+        opt.setIndicator(new NotificationIndicator(NotificationIndicator.TYPE_SUCCESS));
+        ButtonOptions bo1 = new ButtonOptions("Button 1");
+        bo1.setOnClick(new NotificationActionResult(new JSONObject().put("btn", "btn1")));
+        ButtonOptions bo2 = new ButtonOptions("Button 2");
+        bo2.setOnClick(new NotificationActionResult(new JSONObject().put("btn", "btn2")));
+        bo2.setCta(true);
+        opt.setButtons(bo1, bo2);
+
+        this.notifications.create(opt);
     }
 
     private void testOpacity() {
         this.selectedApplication.getWindow().getOptions(new AsyncCallback<WindowOptions>() {
             @Override
             public void onSuccess(WindowOptions result) {
-                java.lang.System.out.println("getOptions: " + result.toJsonObject().toString());
+                java.lang.System.out.println("getOptions: " + result.getJson().toString());
                 double opacity = result.getOpacity() > 0.5 ? 0.5 : 1;
                 WindowOptions options = new WindowOptions();
                 options.setOpacity(opacity);
@@ -685,18 +709,6 @@ private void testRoundedCorners() {
             e.printStackTrace();
         }
     }
-    private void testRoundedCorners2() {
-        this.selectedApplication.getWindow().getOptions(new AsyncCallback<WindowOptions>() {
-            @Override
-            public void onSuccess(WindowOptions result) {
-                java.lang.System.out.println("getOptions: " + result.toJsonObject().toString());
-                int width = result.getCornerRoundingWidth() > 0 ? 0 : 10;
-                WindowOptions options = new WindowOptions();
-                options.setCornerRounding(width, width);
-                selectedApplication.getWindow().updateOptions(options, null);
-            }
-        }, null);
-    }
 
     private void testOpacityAnimation() {
         this.selectedApplication.getWindow().getOptions(new AsyncCallback<WindowOptions>() {
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java
deleted file mode 100644
index 57da058..0000000
--- a/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package com.openfin.desktop.demo;
-
-import com.openfin.desktop.DockingManager;
-import com.openfin.desktop.*;
-import info.clearthought.layout.TableLayout;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.lang.System;
-import java.util.Arrays;
-
-/**
- * Example of snap&dock Java window with OpenFin html5 window
- *
- * Move windows close to each other so they snap, and release mouse to dock 2 windows.
- *
- * This example use snap and dock library at https://github.com/openfin/java-snap-and-dock.
- *
- * Steps to implement snap&dock in this example
- *
- * 1. Launch OpenFin Runtime, as in startOpenFinRuntime
- * 2. Create an instance of DockingManager
- * 2. Launch a HTML5 app and register with DockingManager as in launchHTMLApps
- * 3. Register Java window as in DockingManager registerJavaWindow
- *
- * All windows can receive notification when it is docked by subscribing to 'window-docked' topic.  It can also request to be undocked
- * by sending a message to Docking Manager.   Please refer to document of Snap&Dock library for more into
- *
- * Created by wche on 2/28/15.
- *
- */
-public class OpenFinDockingDemo extends JPanel implements ActionListener, WindowListener {
-    private final static Logger logger = LoggerFactory.getLogger(OpenFinDockingDemo.class.getName());
-
-    private static JFrame jFrame;
-    protected JButton launch;
-    protected JButton close;
-
-    protected JButton undockButton;
-
-    // For a Java window to be dockable, it must be registered with Runtime as a child window of a HTML5 app.  We are going to create
-    // a hidden HTML5 app, with javaParentAppUuid as UUID, as the parent app of all Java windows
-    protected String javaParentAppUuid = "Java Parent App";
-
-    protected String appUuid = "JavaDocking";  // UUID for desktopConnection
-    protected String javaWindowName = "Java Dock Window";
-    protected String openfin_app_url = "https://cdn.openfin.co/examples/junit/SimpleDockingExample.html";  // source is in release/SimpleDockingExample.html
-
-    protected DesktopConnection desktopConnection;
-    protected DockingManager dockingManager;
-    protected JTextField dockStatus;  // show Ready to dock message
-    protected JTextArea status;
-
-    public OpenFinDockingDemo() {
-        try {
-            this.desktopConnection = new DesktopConnection(appUuid);
-        } catch (DesktopException desktopError) {
-            desktopError.printStackTrace();
-        }
-        setLayout(new BorderLayout());
-        add(layoutCenterPanel(), BorderLayout.CENTER);
-        add(layoutLeftPanel(), BorderLayout.WEST);
-        setBorder(BorderFactory.createEmptyBorder(20,20,20,20));
-        setMainButtonsEnabled(false);
-        setAppButtonsEnabled(false);
-    }
-
-    private JPanel layoutLeftPanel() {
-        JPanel panel = new JPanel();
-        double size[][] = {{410}, {120, 30, TableLayout.FILL}};
-        panel.setLayout(new TableLayout(size));
-        panel.add(layoutActionButtonPanel(), "0,0,0,0");
-        panel.add(layoutDockStatus(), "0,1,0,1");
-        panel.add(layoutStatusPanel(), "0, 2, 0, 2");
-        return panel;
-    }
-
-    private JTextField layoutDockStatus() {
-        this.dockStatus = new JTextField();
-        this.dockStatus.setForeground(Color.RED);
-        return this.dockStatus;
-    }
-
-    private JPanel layoutActionButtonPanel() {
-        JPanel buttonPanel = new JPanel();
-
-        JPanel topPanel = new JPanel();
-        double size[][] = {{10, 190, 20, 190, 10}, {25, 10, 25, 10}};
-        topPanel.setLayout(new TableLayout(size));
-        topPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createBevelBorder(2), "Desktop"));
-
-        launch = new JButton("Launch OpenFin");
-        launch.setActionCommand("start");
-        close = new JButton("Shutdown OpenFin");
-        close.setActionCommand("close");
-        topPanel.add(launch, "1,0,1,0");
-        topPanel.add(close, "3,0,3,0");
-
-        undockButton = new JButton("Undock");
-        undockButton.setActionCommand("undock-window");
-        undockButton.setEnabled(false);
-        topPanel.add(undockButton, "1,2,1,2");
-
-        close.addActionListener(this);
-        launch.addActionListener(this);
-        undockButton.addActionListener(this);
-
-        buttonPanel.add(topPanel, "0,0");
-        return buttonPanel;
-    }
-
-    private JPanel layoutCenterPanel() {
-        JPanel panel = new JPanel();
-        double size[][] = {{TableLayout.FILL}, {150, 150, TableLayout.FILL}};
-        panel.setLayout(new TableLayout(size));
-
-        return panel;
-    }
-
-    protected JPanel layoutStatusPanel() {
-        //Simple status console
-        status = new JTextArea();
-        status.setEditable(false);
-        status.setAutoscrolls(true);
-        status.setLineWrap(true);
-        JScrollPane statusPane = new JScrollPane(status);
-        statusPane.setVerticalScrollBarPolicy(
-                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-        statusPane.getViewport().setOpaque(false);
-        statusPane.setOpaque(false);
-        statusPane.setBorder(BorderFactory.createEmptyBorder(5,15,15,15));
-
-
-
-        JPanel panel = new JPanel();
-        panel.setLayout(new BorderLayout());
-        panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createBevelBorder(2), "Status"));
-        panel.add(statusPane, BorderLayout.CENTER);
-
-        return panel;
-    }
-
-    @Override
-    public void windowOpened(WindowEvent e) {
-    }
-
-    @Override
-    public void windowClosing(WindowEvent e) {
-        closeDesktop();
-    }
-
-    @Override
-    public void windowClosed(WindowEvent e) {
-    }
-
-    @Override
-    public void windowIconified(WindowEvent e) {
-    }
-
-    @Override
-    public void windowDeiconified(WindowEvent e) {
-    }
-
-    @Override
-    public void windowActivated(WindowEvent e) {
-    }
-
-    @Override
-    public void windowDeactivated(WindowEvent e) {
-    }
-
-    private void updateMessagePanel(final String msg) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            String t = "";
-            if (status.getText().length() > 0) {
-                t = status.getText();
-            }
-            StringBuilder b = new StringBuilder();
-            b.append(msg).append("\n").append(t);
-            status.setText(b.toString());
-            status.setCaretPosition(0);
-        } else {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    updateMessagePanel(msg);
-                }
-            });
-        }
-    }
-
-
-    private void closeDesktop() {
-        if (desktopConnection != null && desktopConnection.isConnected()) {
-            try {
-                Application javaParentApp = Application.wrap(javaParentAppUuid, desktopConnection);
-                javaParentApp.close();
-                dockingManager.dispose();
-                Thread.sleep(2000);
-                desktopConnection.exit();
-                desktopConnection = null;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            Thread.sleep(2000);
-            System.exit(0);
-        } catch (InterruptedException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-    private void undockFromOtherWindows() {
-        try {
-            // send message to Docking Manager to undock me
-            JSONObject msg = new JSONObject();
-            msg.put("applicationUuid", javaParentAppUuid);
-            msg.put("windowName", javaWindowName);
-            desktopConnection.getInterApplicationBus().publish("undock-window", msg);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        undockButton.setEnabled(false);
-    }
-
-    /**
-     *
-     * Start OpenFin Runtime
-     *
-     */
-    private void startOpenFinRuntime() {
-        try {
-            DesktopStateListener listener = new DesktopStateListener() {
-                @Override
-                public void onReady() {
-                    onRuntimeReady();
-                }
-
-                @Override
-                public void onClose(String error) {
-                    updateMessagePanel(String.format("Connection closed %s", error));
-                }
-                @Override
-                public void onError(String reason) {
-                    updateMessagePanel("Connection failed: " + reason);
-                }
-                @Override
-                public void onMessage(String message) {
-                }
-                @Override
-                public void onOutgoingMessage(String message) {
-                }
-            };
-            RuntimeConfiguration configuration = new RuntimeConfiguration();
-            configuration.setDevToolsPort(9090);
-            configuration.setAdditionalRuntimeArguments(" --v=1 "); // enable additional logging from Runtime
-            String desktopVersion = java.lang.System.getProperty("com.openfin.demo.version");
-            if (desktopVersion == null) {
-                desktopVersion = "stable";
-            }
-            configuration.setRuntimeVersion(desktopVersion);
-            desktopConnection.connect(configuration, listener, 60);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void onRuntimeReady() {
-        try {
-            updateMessagePanel("Connection authorized.");
-            setMainButtonsEnabled(true);
-            this.dockingManager = new DockingManager(this.desktopConnection, this.javaParentAppUuid);
-            this.desktopConnection.getInterApplicationBus().subscribe("*", "window-docked", (uuid, topic, data) -> {
-                JSONObject event = (JSONObject) data;
-                String appUuid = event.getString("applicationUuid");
-                String windowName = event.getString("windowName");
-                updateMessagePanel(String.format("Window docked %s %s", appUuid, windowName));
-                if (javaParentAppUuid.equals(appUuid) && javaWindowName.equals(windowName)) {
-                    updateUndockButton(true);
-                }
-            });
-            this.desktopConnection.getInterApplicationBus().subscribe("*", "window-undocked", (uuid, topic, data) -> {
-                JSONObject event = (JSONObject) data;
-                String appUuid = event.getString("applicationUuid");
-                String windowName = event.getString("windowName");
-                updateMessagePanel(String.format("Window undocked %s %s", appUuid, windowName));
-                if (javaParentAppUuid.equals(appUuid) && javaWindowName.equals(windowName)) {
-                    updateUndockButton(false);
-                }
-            });
-            registerJavaWindow();
-            launchHTMLApps();
-            launchAnotherJavaApp();
-        } catch (Exception e) {
-            logger.error("Error creating DockingManager", e);
-        }
-    }
-
-    public void actionPerformed(java.awt.event.ActionEvent e) {
-        if ("start".equals(e.getActionCommand())) {
-            startOpenFinRuntime();
-        } else if ("close".equals(e.getActionCommand())) {
-            closeDesktop();
-        } else if ("undock-window".equals(e.getActionCommand())) {
-            undockFromOtherWindows();
-        }
-    }
-
-
-    private void setMainButtonsEnabled(boolean enabled) {
-        launch.setEnabled(!enabled);
-        close.setEnabled(enabled);
-    }
-
-    private void setAppButtonsEnabled(boolean enabled) {
-    }
-
-    /**
-     * Register Java window with OpenFin Runtime
-     *
-     */
-    private void registerJavaWindow() {
-        try {
-            // Java window needs to be assigned a HTML5 app as parent app in order for Runtime to control it.
-            // now we are creating a HTML5 app aith autoShow = false so it is hidden.
-            ApplicationOptions options = new ApplicationOptions(javaParentAppUuid, javaParentAppUuid, openfin_app_url);
-            options.setApplicationIcon("http://openfin.github.io/snap-and-dock/openfin.ico");
-            WindowOptions mainWindowOptions = new WindowOptions();
-            mainWindowOptions.setAutoShow(false);
-            mainWindowOptions.setDefaultHeight(50);
-            mainWindowOptions.setDefaultLeft(50);
-            mainWindowOptions.setDefaultTop(50);
-            mainWindowOptions.setDefaultWidth(50);
-            mainWindowOptions.setShowTaskbarIcon(false);
-            mainWindowOptions.setSaveWindowState(false);  // set to false so all windows start at same initial positions for each run
-            options.setMainWindowOptions(mainWindowOptions);
-            launchHTMLApp(options, new AckListener() {
-                @Override
-                public void onSuccess(Ack ack) {
-                    Application app = (Application) ack.getSource();
-                    logger.debug("Registering java window");
-                    dockingManager.registerJavaWindow(javaWindowName, jFrame,
-                        new AckListener() {
-                            @Override
-                            public void onSuccess(Ack ack) {
-                                if (ack.isSuccessful()) {
-                                    undockButton.setEnabled(false);
-                                }
-                            }
-                            @Override
-                            public void onError(Ack ack) {
-                                logger.error("Error registering Java window " + ack.getReason());
-                            }
-                        });
-                }
-                @Override
-                public void onError(Ack ack) {
-                    logger.error("Error launching " + javaParentAppUuid);
-                }
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     *
-     * Launching HTML5 apps and register docking manager
-     *
-     */
-    private void launchHTMLApps() {
-        // launch 5 instances of same example app
-        int width = 300, height=200;
-        int gap = 50;  // gap between windows at initial positions
-        for (int i = 0; i < 2; i++) {
-            try {
-                String uuid = String.format("docking-html-%d", i);
-                ApplicationOptions options = new ApplicationOptions(uuid, uuid, openfin_app_url);
-                options.setApplicationIcon("http://openfin.github.io/snap-and-dock/openfin.ico");
-                WindowOptions mainWindowOptions = new WindowOptions();
-                mainWindowOptions.setAutoShow(true);
-                mainWindowOptions.setDefaultHeight(height);
-                mainWindowOptions.setDefaultLeft(10 + i * (width + gap));
-                mainWindowOptions.setDefaultTop(50);
-                mainWindowOptions.setDefaultWidth(width);
-                mainWindowOptions.setShowTaskbarIcon(true);
-                mainWindowOptions.setSaveWindowState(false);  // set to false so all windows start at same initial positions for each run
-                options.setMainWindowOptions(mainWindowOptions);
-                launchHTMLApp(options, new AckListener() {
-                    @Override
-                    public void onSuccess(Ack ack) {
-                        logger.debug(String.format("Successful launching %s", options.getUUID()));
-                        Application app = (Application) ack.getSource();
-                        dockingManager.registerWindow(app.getWindow());
-                    }
-                    @Override
-                    public void onError(Ack ack) {
-                        logger.error(String.format("Error launching %s %s", options.getUUID(), ack.getReason()));
-                    }
-                });
-            } catch (Exception e) {
-                logger.error("Error launching app", e);
-            }
-        }
-    }
-
-    private void launchHTMLApp(ApplicationOptions options, AckListener ackListener) throws Exception {
-        logger.debug(String.format("Launching %s", options.getUUID()));
-        DemoUtils.runApplication(options, this.desktopConnection, ackListener);
-    }
-
-
-    private void launchAnotherJavaApp() {
-        Thread launchThread = new Thread() {
-            public void run() {
-                logger.debug(String.format("Launching docking.bat %s", DockingDemo2.class.getName()));
-                String[] command = {"docking.bat", DockingDemo2.class.getName()};
-                ProcessBuilder probuilder = new ProcessBuilder( command );
-                //You can set up your work directory
-                probuilder.directory(new File("."));
-                try {
-//                    Process process = probuilder.start();
-//                    //Read out dir output
-//                    InputStream is = process.getInputStream();
-//                    InputStreamReader isr = new InputStreamReader(is);
-//                    BufferedReader br = new BufferedReader(isr);
-//                    String line;
-//                    while ((line = br.readLine()) != null) {
-//                        logger.debug(String.format("Java App output: %s", line));
-//                    }
-//                    int exitValue = process.waitFor();
-//                    logger.debug(String.format("Java app exit code %d", exitValue));
-
-                    Process process = Runtime.getRuntime().exec("cmd");
-                    OutputStream stdin = process.getOutputStream();
-                    InputStream stderr = process.getErrorStream();
-                    InputStream stdout = process.getInputStream();
-                    String line = "start docking.bat " + DockingDemo2.class.getName() + "\n";
-                    stdin.write(line.getBytes());
-                    stdin.flush();
-                    stdin.close();
-                    // clean up if any output in stdout
-                    BufferedReader brCleanUp =
-                            new BufferedReader(new InputStreamReader(stdout));
-                    while ((line = brCleanUp.readLine()) != null) {
-                        logger.debug("[Stdout] " + line);
-                    }
-                    brCleanUp.close();
-                    // clean up if any output in stderr
-                    brCleanUp =
-                            new BufferedReader(new InputStreamReader(stderr));
-                    while ((line = brCleanUp.readLine()) != null) {
-                        logger.info("[Stderr] " + line);
-                    }
-                    brCleanUp.close();
-                } catch (Exception ex) {
-                    logger.error("Error launch java app", ex);
-                }
-            }
-        };
-        launchThread.start();
-    }
-
-    private void updateUndockButton(boolean enabled) {
-        this.undockButton.setEnabled(enabled);
-        if (enabled) {
-            this.dockStatus.setText("Docked. Click Unlock button to undock");
-        } else {
-            this.dockStatus.setText("");
-        }
-    }
-
-
-    private static void createAndShowGUI() {
-        //Create and set up the window.
-        jFrame = new JFrame("Java Docking Demo");
-        jFrame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-
-        //Create and set up the content pane.
-        OpenFinDockingDemo newContentPane = new OpenFinDockingDemo();
-        newContentPane.setOpaque(true); //content panes must be opaque
-        jFrame.setContentPane(newContentPane);
-        jFrame.addWindowListener(newContentPane);
-
-        //Display the window.
-        jFrame.pack();
-        jFrame.setSize(470, 300);
-        jFrame.setLocation(100, 400);
-//        jFrame.setLocationRelativeTo(null);
-        jFrame.setResizable(false);
-        jFrame.setVisible(true);
-    }
-
-
-    /**
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                createAndShowGUI();
-            }
-        });
-    }
-
-}
diff --git a/src/main/java/com/openfin/desktop/demo/Signer.java b/src/main/java/com/openfin/desktop/demo/Signer.java
new file mode 100644
index 0000000..4c3bd42
--- /dev/null
+++ b/src/main/java/com/openfin/desktop/demo/Signer.java
@@ -0,0 +1,98 @@
+package com.openfin.desktop.demo;
+
+import java.io.InputStream;
+import java.security.CodeSigner;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+public class Signer {
+    private final String filename;
+
+    public Signer(String filename) {
+        this.filename = filename;
+    }
+
+    public void verify() throws Exception {
+        JarFile jar = new JarFile(this.filename, true);
+
+        Enumeration<JarEntry> entries = jar.entries();
+        while (entries.hasMoreElements()) {
+            JarEntry entry = entries.nextElement();
+            byte[] buffer = new byte[8192];
+            InputStream is = jar.getInputStream(entry);
+            while ((is.read(buffer, 0, buffer.length)) != -1) {
+                // We just read. This will throw a SecurityException
+                // if a signature/digest check fails.
+            }
+            is.close();
+        }
+
+        if (!checkSign(jar)) {
+            throw new SecurityException("not signed");
+        }
+
+    }
+
+    private boolean checkSign(JarFile jar) throws Exception {
+        InputStream jis = jar.getInputStream(jar.getEntry("META-INF/MANIFEST.MF"));
+        Manifest man = new Manifest(jis);
+        jis.close();
+
+        HashSet<String> signed = new HashSet<>();
+        for(Map.Entry<String, Attributes> entry: man.getEntries().entrySet()) {
+            for(Object attrkey: entry.getValue().keySet()) {
+                if (attrkey instanceof Attributes.Name && attrkey.toString().contains("-Digest")) {
+                    signed.add(entry.getKey());
+                }
+            }
+        }
+        System.out.printf("Number of Digest from manifest %d \n", signed.size());
+
+        Set<String> entries = new HashSet<>();
+        for(Enumeration<JarEntry> entry = jar.entries(); entry.hasMoreElements(); ) {
+            JarEntry je = entry.nextElement();
+            String fileName = je.getName().toUpperCase();
+            if (!je.isDirectory()
+                    && !fileName.endsWith(".MF")
+                    && !fileName.endsWith(".SF")
+                    && !fileName.endsWith(".DSA")
+                    && !fileName.endsWith(".EC")
+                    && !fileName.endsWith(".RSA")
+            ) {
+                CodeSigner[] signers = je.getCodeSigners();
+                if (signers != null && signers.length == 1) {
+                    CodeSigner signer = signers[0];
+                    if (signer.getSignerCertPath().getCertificates().size() != 4) {
+                        throw new SecurityException(String.format("invalid cert chain %s", je.getName()));
+                    }
+                    X509Certificate cert = (X509Certificate) signer.getSignerCertPath().getCertificates().get(0);
+                    if (!cert.getSubjectDN().toString().contains("OpenFin Inc.")) {
+                        throw new SecurityException(String.format("invalid signed %s", je.getName()));
+                    }
+                    entries.add(je.getName());
+                } else {
+                    throw new SecurityException(String.format("missing cert %s", je.getName()));
+                }
+            }
+        }
+        System.out.printf("Number of signed entries %d \n", entries.size());
+
+        Set<String> unsigned = new HashSet<>(entries);
+        unsigned.removeAll(signed);
+        return unsigned.size() == 0;
+    }
+
+    public static void main(String[] args) throws Exception {
+        Signer signer = new Signer(args[0]);
+        signer.verify();
+    }
+
+}
diff --git a/src/test/java/com/openfin/desktop/AllTests.java b/src/test/java/com/openfin/desktop/AllTests.java
index 68f0374..cc84773 100644
--- a/src/test/java/com/openfin/desktop/AllTests.java
+++ b/src/test/java/com/openfin/desktop/AllTests.java
@@ -10,6 +10,6 @@
  */
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ ApplicationTest.class, OpenFinRuntimeTest.class, WindowTest.class, SystemTest.class, InterApplicationBusTest.class, ChannelTest.class, RuntimeConfigTest.class})
+@Suite.SuiteClasses({ ApplicationTest.class, OpenFinRuntimeTest.class, WindowTest.class, SystemTest.class, InterApplicationBusTest.class, ChannelTest.class, RuntimeConfigTest.class, InteropTest.class, SnapshotTest.class})
 public class AllTests {
 }
diff --git a/src/test/java/com/openfin/desktop/ApplicationTest.java b/src/test/java/com/openfin/desktop/ApplicationTest.java
index e3425c3..4eedf85 100644
--- a/src/test/java/com/openfin/desktop/ApplicationTest.java
+++ b/src/test/java/com/openfin/desktop/ApplicationTest.java
@@ -155,110 +155,6 @@ public void createChildWindow() throws Exception {
         TestUtils.closeApplication(application);
     }
 
-    @Test
-    public void crossAppDockAndUndock() throws Exception {
-        Application application1 = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);
-        Application application2 = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);
-
-        WindowBounds beforeMoveBounds = TestUtils.getBounds(application2.getWindow());
-        CountDownLatch joinLatch = new CountDownLatch(1);
-        application2.getWindow().joinGroup(application1.getWindow(), new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    joinLatch.countDown();
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(String.format("onError %s", ack.getReason()));
-            }
-        });
-        joinLatch.await(3, TimeUnit.SECONDS);
-        assertEquals(joinLatch.getCount(), 0);
-
-        // get group info for a window
-        CountDownLatch groupInfoLatch = new CountDownLatch(2);
-        application1.getWindow().getGroup(result -> {
-            for (Window window : result) {
-                if (window.getUuid().equals(application1.getWindow().getUuid()) && window.getName().equals(application1.getWindow().getName())) {
-                    groupInfoLatch.countDown();
-                } else if (window.getUuid().equals(application2.getWindow().getUuid()) && window.getName().equals(application2.getWindow().getName())) {
-                    groupInfoLatch.countDown();
-                }
-            }
-        }, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(String.format("onError %s", ack.getReason()));
-            }
-        });
-        groupInfoLatch.await(3, TimeUnit.SECONDS);
-        assertEquals(groupInfoLatch.getCount(), 0);
-
-        // get group info for an application
-        CountDownLatch appGroupInfoLatch = new CountDownLatch(2);
-        application1.getGroups(result -> {
-                    for (List<Window> list: result) {
-                        for (Window window : list) {
-                            if (window.getUuid().equals(application1.getWindow().getUuid()) && window.getName().equals(application1.getWindow().getName())) {
-                                appGroupInfoLatch.countDown();
-                            } else if (window.getUuid().equals(application2.getWindow().getUuid()) && window.getName().equals(application2.getWindow().getName())) {
-                                appGroupInfoLatch.countDown();
-                            }
-                        }
-                    }
-                }, new AckListener() {
-                    @Override
-                    public void onSuccess(Ack ack) {
-                    }
-                    @Override
-                    public void onError(Ack ack) {
-                        logger.error(String.format("onError %s", ack.getReason()));
-                    }
-                }
-        );
-        appGroupInfoLatch.await(3, TimeUnit.SECONDS);
-        assertEquals(appGroupInfoLatch.getCount(), 0);
-
-        int leftBy = 20, topBy = 30;
-        TestUtils.moveWindowBy(application1.getWindow(), leftBy, topBy);
-        // child window sohuld move with main window since they are docked
-        WindowBounds afterMoveBounds = TestUtils.getBounds(application2.getWindow());
-        int topAfterDockMove = afterMoveBounds.getTop(), leftAfterDockMove = afterMoveBounds.getLeft();
-        assertEquals(afterMoveBounds.getTop() - beforeMoveBounds.getTop(), topBy);
-        assertEquals(afterMoveBounds.getLeft() - beforeMoveBounds.getLeft(), leftBy);
-
-        // undock by leaving the group
-        CountDownLatch undockLatch = new CountDownLatch(1);
-        application2.getWindow().leaveGroup(new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    undockLatch.countDown();
-                }
-            }
-
-            @Override
-            public void onError(Ack ack) {
-                logger.error(String.format("onError %s", ack.getReason()));
-            }
-        });
-        undockLatch.await(5, TimeUnit.SECONDS);
-        assertEquals(undockLatch.getCount(), 0);
-        TestUtils.moveWindowBy(application1.getWindow(), leftBy, topBy);
-        // child window should not move afer leaving group
-        afterMoveBounds = TestUtils.getBounds(application2.getWindow());
-        assertEquals(afterMoveBounds.getLeft().intValue(), leftAfterDockMove);
-        assertEquals(afterMoveBounds.getTop().intValue(), topAfterDockMove);
-
-        TestUtils.closeApplication(application1);
-        TestUtils.closeApplication(application2);
-    }
-    
 	@Test
 	public void addEventListener() throws Exception {
 		ApplicationOptions options = TestUtils.getAppOptions(null);
@@ -553,4 +449,43 @@ public void onError(Ack ack) {
 
 		assertEquals(0, latch.getCount());
 	}
+	
+	@Test
+	public void errorStack() throws Exception {
+		Application application = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);
+		final CountDownLatch latch = new CountDownLatch(1);
+
+		application.close(true, new AckListener() {
+
+			@Override
+			public void onSuccess(Ack ack) {
+				application.getChildWindows(new AsyncCallback<List<Window>>() {
+
+					@Override
+					public void onSuccess(List<Window> result) {
+					}
+				}, new AckListener() {
+
+					@Override
+					public void onSuccess(Ack ack) {
+					}
+
+					@Override
+					public void onError(Ack ack) {
+						if (ack.getErrorStack() != null) {
+							latch.countDown();
+						}
+					}
+				});
+			}
+
+			@Override
+			public void onError(Ack ack) {
+			}
+		});
+
+		latch.await(5, TimeUnit.SECONDS);
+
+		assertEquals(0, latch.getCount());
+	}
 }
diff --git a/src/test/java/com/openfin/desktop/ChannelTest.java b/src/test/java/com/openfin/desktop/ChannelTest.java
index c564912..e8009de 100644
--- a/src/test/java/com/openfin/desktop/ChannelTest.java
+++ b/src/test/java/com/openfin/desktop/ChannelTest.java
@@ -2,34 +2,21 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
+import com.openfin.desktop.channel.*;
 import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.openfin.desktop.channel.ChannelAction;
-import com.openfin.desktop.channel.ChannelClient;
-import com.openfin.desktop.channel.ChannelListener;
-import com.openfin.desktop.channel.ChannelProvider;
-import com.openfin.desktop.channel.ConnectionEvent;
-import com.openfin.desktop.channel.Middleware;
-
 /**
- * JUnit tests for com.openfin.desktop.InterApplicationBus class
- *
- * Test cases in this class need to have access to an OpenFin HTML5 app to
- * verify sub/pub workflow. Sources for the app can be found in release
- * directory: PubSubExample.html. It is hosted by OpenFin at
- * https://cdn.openfin.co/examples/junit/PubSubExample.html
+ * JUnit tests for OpenFin Channel API
  *
  * Created by wche on 1/27/16.
  *
@@ -54,15 +41,25 @@ public static void teardown() throws Exception {
 	@Test
 	public void createChannelProvider() throws Exception {
 		CountDownLatch latch = new CountDownLatch(1);
-		desktopConnection.getChannel().create("createChannelProviderTest", new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel("createChannelProvider").create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
 				latch.countDown();
 			}
 		});
-
 		latch.await(10, TimeUnit.SECONDS);
+		assertEquals(0, latch.getCount());
+	}
 
+	@Test
+	public void createChannelProviderAsync() throws Exception {
+		CountDownLatch latch = new CountDownLatch(1);
+		desktopConnection.getChannel("createChannelProviderAsync").createAsync().thenAccept(provider -> {
+			if (Objects.nonNull(provider)) {
+				latch.countDown();
+			}
+		});
+		latch.await(10, TimeUnit.SECONDS);
 		assertEquals(0, latch.getCount());
 	}
 
@@ -70,35 +67,101 @@ public void onSuccess(ChannelProvider provider) {
 	public void createChannelClient() throws Exception {
 		CountDownLatch latch = new CountDownLatch(1);
 		final String channelName = "createChannelClientTest";
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
-				desktopConnection.getChannel().connect(channelName, new AsyncCallback<ChannelClient>() {
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
 					@Override
 					public void onSuccess(ChannelClient result) {
 						latch.countDown();
 					}
+				});
+			}
+		});
+		latch.await(10, TimeUnit.SECONDS);
+		assertEquals(0, latch.getCount());
+	}
+	@Test
+	public void createChannelClientAsync() throws Exception {
+		CountDownLatch latch = new CountDownLatch(1);
+		final String channelName = "createChannelClientAsync";
+		desktopConnection.getChannel(channelName).createAsync().thenAccept(provider -> {
+			desktopConnection.getChannel(channelName).connectAsync().thenAccept(client -> {
+				if (Objects.nonNull(client)) {
+					latch.countDown();
+				}
+			});
+		});
+		latch.await(10, TimeUnit.SECONDS);
+		assertEquals(0, latch.getCount());
+	}
 
+	@Test
+	public void multipleChannelClients() throws Exception {
+		CountDownLatch latch1 = new CountDownLatch(1);
+		CountDownLatch latch2 = new CountDownLatch(1);
+		final String channelName = "createMultipleChannelClientTest";
+		final String clientActionName = "clientAction";
+		final String providerActionName = "providerAction";
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
+			@Override
+			public void onSuccess(ChannelProvider provider) {
+				provider.register(providerActionName, new ChannelAction() {
+					@Override
+					public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+						return null;
+					}
+				});
+
+				//first channel client
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
+					@Override
+					public void onSuccess(ChannelClient client) {
+						client.dispatch(providerActionName, new JSONObject(), null);
+						client.register(clientActionName, new ChannelAction() {
+							@Override
+							public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+								latch1.countDown();
+								return null;
+							}
+						});
+					}
+				});
+				//second channel client
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
+					@Override
+					public void onSuccess(ChannelClient client) {
+						client.register(clientActionName, new ChannelAction() {
+							@Override
+							public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+								latch2.countDown();
+								return null;
+							}
+						});
+						provider.publish(clientActionName, new JSONObject(), null);
+					}
 				});
 			}
 		});
 
-		latch.await(10, TimeUnit.SECONDS);
+		latch1.await(10, TimeUnit.SECONDS);
+		latch2.await(10, TimeUnit.SECONDS);
 
-		assertEquals(0, latch.getCount());
+		assertEquals(0, latch1.getCount());
+		assertEquals(0, latch2.getCount());
 	}
 
 	@Test
 	public void registerAction() throws Exception {
 		final String channelName = "registerActionTest";
 		CountDownLatch latch = new CountDownLatch(1);
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
 				provider.register("currentTime", new ChannelAction() {
 					@Override
-					public JSONObject invoke(String action, JSONObject payload) {
-						return payload.put("currentTime", java.lang.System.currentTimeMillis());
+					public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+						return ((JSONObject)payload).put("currentTime", java.lang.System.currentTimeMillis());
 					}
 				});
 				latch.countDown();
@@ -118,18 +181,18 @@ public void invokeProviderAction() throws Exception {
 		final AtomicInteger resultValue = new AtomicInteger(-1);
 
 		CountDownLatch latch = new CountDownLatch(1);
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
 				provider.register(actionName, new ChannelAction() {
 					@Override
-					public JSONObject invoke(String action, JSONObject payload) {
-						int currentValue = payload.getInt("value");
-						return payload.put("value", currentValue + 1);
+					public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+						int currentValue = ((JSONObject)payload).getInt("value");
+						return ((JSONObject)payload).put("value", currentValue + 1);
 					}
 				});
 
-				desktopConnection.getChannel().connect(channelName, new AsyncCallback<ChannelClient>() {
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
 
 					@Override
 					public void onSuccess(ChannelClient client) {
@@ -158,48 +221,75 @@ public void onError(Ack ack) {
 		assertEquals(0, latch.getCount());
 		assertEquals(initValue + 1, resultValue.get());
 	}
-
+	
 	@Test
-	public void publishToClient() throws Exception {
-		final String channelName = "publishToClientTest";
-		final String actionName = "message";
-		final String actionMessage = "actionMessage";
+	public void invokeClientAction() throws Exception {
+		final String channelName = "invokeClientActionTest";
+		final String providerActionName = "invokeClientAction";
+		final String clientActionName = "clientAction";
 
 		CountDownLatch latch = new CountDownLatch(1);
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
-				desktopConnection.getChannel().addChannelListener(new ChannelListener() {
+				provider.register(providerActionName, new ChannelAction() {
 					@Override
-					public void onChannelConnect(ConnectionEvent connectionEvent) {
-						// once the channel is connected, invoke publish method
-						JSONObject payload = new JSONObject();
-						payload.put("message", actionMessage);
-						provider.publish(actionName, payload, null);
+					public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+						provider.dispatch(senderIdentity, clientActionName, new JSONObject(), null);
+						return null;
 					}
+				});
 
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
 					@Override
-					public void onChannelDisconnect(ConnectionEvent connectionEvent) {
+					public void onSuccess(ChannelClient client) {
+						client.register(clientActionName, new ChannelAction() {
+							@Override
+							public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+								latch.countDown();
+								return null;
+							}
+						});
 
+						client.dispatch(providerActionName, new JSONObject(), null);
 					}
 				});
+			}
+		});
 
-				desktopConnection.getChannel().connect(channelName, new AsyncCallback<ChannelClient>() {
+		latch.await(10, TimeUnit.SECONDS);
 
+		assertEquals(0, latch.getCount());
+	}
+
+	@Test
+	public void publishToClient() throws Exception {
+		final String channelName = "publishToClientTest";
+		final String actionName = "message";
+		final String actionMessage = "actionMessage";
+
+		CountDownLatch latch = new CountDownLatch(1);
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
+			@Override
+			public void onSuccess(ChannelProvider provider) {
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
 					@Override
 					public void onSuccess(ChannelClient client) {
 
 						client.register(actionName, new ChannelAction() {
 							@Override
-							public JSONObject invoke(String action, JSONObject payload) {
-								if (actionName.equals(action) && actionMessage.equals(payload.getString("message"))) {
+							public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+								if (actionName.equals(action) && actionMessage.equals(((JSONObject)payload).getString("message"))) {
 									latch.countDown();
 								}
 								return null;
 							}
 						});
+						
+						JSONObject payload = new JSONObject();
+						payload.put("message", actionMessage);
+						provider.publish(actionName, payload, null);
 					}
-
 				});
 			}
 		});
@@ -212,35 +302,32 @@ public JSONObject invoke(String action, JSONObject payload) {
 	@Test
 	public void connectionListener() throws Exception {
 		final String channelName = "connectionListenerTest";
-		CountDownLatch latch = new CountDownLatch(2);
-
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
-			@Override
-			public void onSuccess(ChannelProvider provider) {
-				desktopConnection.getChannel().addChannelListener(new ChannelListener() {
+		CountDownLatch latch = new CountDownLatch(3);
+		desktopConnection.getChannel(channelName).createAsync().thenAccept(provider -> {
+			provider.addProviderListener(new ChannelProviderListener() {
+				@Override
+				public void onClientConnect(ChannelClientConnectEvent connectionEvent) throws Exception {
+					latch.countDown();
+				}
+				@Override
+				public void onClientDisconnect(ChannelClientConnectEvent connectionEvent) {
+					latch.countDown();
+				}
+			});
+
+			desktopConnection.getChannel(channelName).connectAsync().thenAccept(client -> {
+				client.disconnect(new AckListener() {
 					@Override
-					public void onChannelConnect(ConnectionEvent connectionEvent) {
+					public void onSuccess(Ack ack) {
 						latch.countDown();
 					}
-
 					@Override
-					public void onChannelDisconnect(ConnectionEvent connectionEvent) {
-						latch.countDown();
+					public void onError(Ack ack) {
 					}
 				});
-
-				desktopConnection.getChannel().connect(channelName, new AsyncCallback<ChannelClient>() {
-					@Override
-					public void onSuccess(ChannelClient client) {
-						desktopConnection.getChannel().disconnect(client, null);
-					}
-
-				});
-			}
+			});
 		});
-
 		latch.await(10, TimeUnit.SECONDS);
-
 		assertEquals(0, latch.getCount());
 	}
 
@@ -253,29 +340,29 @@ public void middlewareAction() throws Exception {
 		final AtomicInteger resultValue = new AtomicInteger(-1);
 
 		CountDownLatch latch = new CountDownLatch(1);
-		desktopConnection.getChannel().create(channelName, new AsyncCallback<ChannelProvider>() {
+		desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
 			@Override
 			public void onSuccess(ChannelProvider provider) {
 				provider.setBeforeAction(new Middleware() {
 
 					@Override
-					public JSONObject invoke(String action, JSONObject payload, JSONObject senderId) {
+					public Object invoke(String action, Object payload, JSONObject senderId) {
 						if (actionName.equals(action)) {
-							int value = payload.getInt("value");
-							payload.put("value", value + middlewareIncrement);
+							int value = ((JSONObject)payload).getInt("value");
+							((JSONObject)payload).put("value", value + middlewareIncrement);
 						}
 						return payload;
 					}});
 				
 				provider.register(actionName, new ChannelAction() {
 					@Override
-					public JSONObject invoke(String action, JSONObject payload) {
-						int currentValue = payload.getInt("value");
-						return payload.put("value", currentValue + 1);
+					public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
+						int currentValue = ((JSONObject)payload).getInt("value");
+						return ((JSONObject) payload).put("value", currentValue + 1);
 					}
 				});
 
-				desktopConnection.getChannel().connect(channelName, new AsyncCallback<ChannelClient>() {
+				desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
 
 					@Override
 					public void onSuccess(ChannelClient client) {
@@ -305,4 +392,38 @@ public void onError(Ack ack) {
 		assertEquals(initValue + 3, resultValue.get());
 	}
 
+	@Test
+	public void rejectConnection() throws Exception {
+		final String channelName = "rejectConnectionTest";
+		final String payloadValue = "reject me";
+		final String rejectReason = "not allowed";
+
+		CountDownLatch latch = new CountDownLatch(1);
+
+		desktopConnection.getChannel(channelName).createAsync().thenAccept(provider -> {
+			provider.addProviderListener(new ChannelProviderListener() {
+				@Override
+				public void onClientConnect(ChannelClientConnectEvent connectionEvent) throws Exception {
+					String payload = (String) connectionEvent.getPayload();
+					if (payloadValue.equals(payload)) {
+						throw new Exception(rejectReason);
+					}
+				}
+				@Override
+				public void onClientDisconnect(ChannelClientConnectEvent connectionEvent) {
+				}
+			});
+
+			desktopConnection.getChannel(channelName).connectAsync(payloadValue).thenAccept(client -> {
+			}).exceptionally(ex -> {
+				if (ex.getMessage().contains(rejectReason)) {
+					latch.countDown();
+				}
+				return null;
+			});
+		});
+
+		latch.await(10, TimeUnit.SECONDS);
+		assertEquals(0, latch.getCount());
+	}
 }
diff --git a/src/test/java/com/openfin/desktop/InterApplicationBusTest.java b/src/test/java/com/openfin/desktop/InterApplicationBusTest.java
index 26f7807..38f4bf1 100644
--- a/src/test/java/com/openfin/desktop/InterApplicationBusTest.java
+++ b/src/test/java/com/openfin/desktop/InterApplicationBusTest.java
@@ -275,50 +275,6 @@ public void unsubscribed(String uuid, String topic) {
         TestUtils.closeApplication(application);
     }
 
-    @Ignore
-    @Test
-    public void wildCardTopic() throws Exception {
-
-        CountDownLatch latch = new CountDownLatch(1);
-        BusListener busListener = (sourceUuid, receivingTopic, payload) -> {
-            logger.debug(String.format("Receiving %s", payload.toString()));
-            // PubSubExample.html sends the following
-            // fin.desktop.InterApplicationBus.publish('check-in', {name: 'Pub/Sub example app'});
-            if (receivingTopic.equals("check-in")) {
-                latch.countDown();
-            }
-        };
-        subscribeToTopic("*", "*", busListener);
-
-        ApplicationOptions options = TestUtils.getAppOptions(openfin_app_url);
-        Application application = TestUtils.createApplication(options, desktopConnection);
-        TestUtils.runApplication(application, true);
-
-        latch.await(5, TimeUnit.SECONDS);
-        assertEquals(latch.getCount(), 0);
-    }
-
-    @Ignore
-    @Test
-    public void wildCardTopicSelf() throws Exception {
-
-        CountDownLatch latch = new CountDownLatch(1);
-        BusListener busListener = (sourceUuid, receivingTopic, payload) -> {
-            logger.debug(String.format("Receiving %s", payload.toString()));
-            if (receivingTopic.equals("wildcard-self")) {
-                latch.countDown();
-            }
-        };
-        subscribeToTopic("*", "*", busListener);
-
-        JSONObject msg = new JSONObject();
-        msg.put("name", "wildCardTopicSelf");
-        desktopConnection.getInterApplicationBus().publish("wildcard-self", msg);
-
-        latch.await(5, TimeUnit.SECONDS);
-        assertEquals(latch.getCount(), 0);
-    }
-
     @Ignore
     @Test
     public void topicWithSpecialCharacters() throws Exception {
diff --git a/src/test/java/com/openfin/desktop/InteropTest.java b/src/test/java/com/openfin/desktop/InteropTest.java
new file mode 100644
index 0000000..7b412c3
--- /dev/null
+++ b/src/test/java/com/openfin/desktop/InteropTest.java
@@ -0,0 +1,203 @@
+package com.openfin.desktop;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.openfin.desktop.interop.Intent;
+import com.openfin.desktop.interop.InteropClient;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.openfin.desktop.interop.Context;
+import com.openfin.desktop.interop.ContextGroupInfo;
+
+public class InteropTest {
+	private static Logger logger = LoggerFactory.getLogger(InteropTest.class.getName());
+
+	private static final String DESKTOP_UUID = InteropTest.class.getName();
+	private static final String BROKER_NANE = "AdapterInteropTest";  // created by javascript side
+	private static DesktopConnection desktopConnection;
+
+	@BeforeClass
+	public static void setup() throws Exception {
+		logger.debug("starting");
+		RuntimeConfiguration cfg = new RuntimeConfiguration();
+		cfg.setManifestLocation("https://testing-assets.openfin.co/adapters/interop/app.json");
+//		cfg.setManifestLocation("http://localhost:5555/app.json");
+		desktopConnection = TestUtils.setupConnection(DESKTOP_UUID, cfg);
+		Thread.sleep(3000);  // give time for the js app to start up and configure everything properly
+	}
+
+	@AfterClass
+	public static void teardown() throws Exception {
+		TestUtils.teardownDesktopConnection(desktopConnection);
+	}
+
+	@Test
+	public void clientGetContextGroupInfo() throws Exception {
+		CompletionStage<ContextGroupInfo[]> getContextFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.getContextGroups();
+		});
+		
+		ContextGroupInfo[] contextGroupInfo = getContextFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+		assertNotNull(contextGroupInfo);
+		assertTrue(contextGroupInfo.length > 0);
+		assertNotNull(contextGroupInfo[0].getDisplayMetadata().getColor());
+	}
+
+	@Test
+	public void clientGetInfoForContextGroup() throws Exception {
+		CompletionStage<ContextGroupInfo> getContextFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.getInfoForContextGroup("red");
+		});
+		
+		ContextGroupInfo contextGroupInfo = getContextFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+		assertNotNull(contextGroupInfo);
+		assertNotNull(contextGroupInfo.getDisplayMetadata().getColor());
+	}
+	
+	@Test
+	public void clientGetAllClientsInContextGroup() throws Exception {
+		CompletionStage<ClientIdentity[]> getContextFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.joinContextGroup("red").thenCompose(v->{
+				return client.getAllClientsInContextGroup("red");
+			});
+		});
+		
+		ClientIdentity[] clientIdentity = getContextFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+		assertNotNull(clientIdentity);
+		assertTrue(clientIdentity.length > 0);
+		assertNotNull(clientIdentity[0].getEndpointId());
+	}
+
+	@Test
+	public void clientJoinThenRemoveFromContextGroup() throws Exception {
+		AtomicInteger clientCntAfterJoin = new AtomicInteger(0);
+		AtomicInteger clientCntAfterRemove = new AtomicInteger(0);
+		CompletionStage<?> testFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.joinContextGroup("green").thenCompose(v->{
+				return client.getAllClientsInContextGroup("green");
+			}).thenAccept(clients->{
+				logger.info(String.format("clientJoinThenRemoveFromContextGroup after join %d", clients.length));
+				clientCntAfterJoin.set(clients.length);
+			}).thenCompose(v->{
+				return client.removeFromContextGroup();
+			}).thenCompose(v->{
+				return client.getAllClientsInContextGroup("green");
+			}).thenAccept(clients->{
+				logger.info(String.format("clientJoinThenRemoveFromContextGroup after remove %d", clients.length));
+				clientCntAfterRemove.set(clients.length);
+			});
+		});
+		
+		testFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+		assertEquals(clientCntAfterJoin.get(), clientCntAfterRemove.incrementAndGet());
+	}
+
+	@Test
+	public void clientSetContext() throws Exception {
+		final Context context = getRandomContext();
+		CompletionStage<Void> setContextFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.getContextGroups().thenCompose(groups->{
+				return client.joinContextGroup("red").thenCompose(v->{
+					return client.setContext(context);
+				});
+			});
+		});
+		
+		setContextFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+	}
+
+	@Test
+	public void clientAddContextListener() throws Exception {
+		final Context context = getRandomContext();
+
+		CompletableFuture<Context> listenerInvokedFuture = new CompletableFuture<>();
+		
+		desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.addContextListener(ctx->{
+				String ticker = ctx.getId().optString("ticker", "");
+				StringBuilder sb = new StringBuilder(context.getId().getString("ticker"));
+				if (ticker.equals(sb.append("1").toString())) {
+					listenerInvokedFuture.complete(ctx);
+				}
+			}).thenApply(v->{
+				return client;
+			});
+		}).thenCompose(client->{
+			return client.joinContextGroup("red").thenCompose(v->{
+				return client.setContext(context);
+			});
+		});
+		
+		Context ctx = listenerInvokedFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+		assertNotNull(ctx);
+	}
+
+	@Test
+	public void clientFireIntent() throws Exception {
+		final Context context = getRandomContext();
+		Intent intent = new Intent();
+		intent.setName("JavaIntent");
+		intent.setContext(context);
+		CompletionStage<Void> fireIntentFuture = desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.fireIntent(intent);
+		});
+		desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.registerIntentListener("JavaIntent", intentReceived->{
+				String ticker = intentReceived.getContext().getId().optString("ticker", "");
+				StringBuilder sb = new StringBuilder(context.getId().getString("ticker"));
+			}).thenCompose(v -> {
+				return client.fireIntent(intent);
+			});
+		});
+
+
+		fireIntentFuture.toCompletableFuture().get(10, TimeUnit.SECONDS);
+	}
+
+	@Test
+	public void clientFireAndRegisterIntentListener() throws Exception {
+		final Context context = getRandomContext();
+
+		CompletableFuture<Intent> listenerInvokedFuture = new CompletableFuture<>();
+		desktopConnection.getInterop().connect(BROKER_NANE).thenCompose(client->{
+			return client.registerIntentListener("JavaIntent", intentReceived->{
+				String ticker = intentReceived.getContext().getId().optString("ticker", "");
+				StringBuilder sb = new StringBuilder(context.getId().getString("ticker"));
+				if (ticker.equals(sb.append("1").toString())) {
+					listenerInvokedFuture.complete(intentReceived);
+				}
+			}).thenCompose(v -> {
+				Intent intent = new Intent();
+				intent.setName("JsTestIntent");
+				intent.setContext(context);
+				return client.fireIntent(intent);
+			});
+		});
+
+		Intent intent = listenerInvokedFuture.toCompletableFuture().get(60, TimeUnit.SECONDS);
+		assertNotNull(intent);
+	}
+
+	private Context getRandomContext() {
+		Long randomTicker = Math.round(Math.random() * 100);
+		final Context context = new Context();
+		JSONObject id = new JSONObject();
+		id.put("ticker", String.format("%d", randomTicker));
+		context.setId(id);
+		context.setType("java");
+		context.setName("java");
+		return context;
+	}
+}
diff --git a/src/test/java/com/openfin/desktop/NotificationTest.java b/src/test/java/com/openfin/desktop/NotificationTest.java
index 44f5765..eeb0fbf 100644
--- a/src/test/java/com/openfin/desktop/NotificationTest.java
+++ b/src/test/java/com/openfin/desktop/NotificationTest.java
@@ -47,128 +47,4 @@ public static void teardown() throws Exception {
         TestUtils.teardownDesktopConnection(desktopConnection);
     }
 
-    @Test
-    public void notificationEventListenersWork() throws Exception {
-        CountDownLatch onShowLatch = new CountDownLatch(1);
-        CountDownLatch onCloseLatch = new CountDownLatch(1);
-
-        NotificationOptions options = new NotificationOptions(notification_url);
-        options.setTimeout(1000);
-        options.setMessageText("Unit test for notification");
-        new Notification(options, new NotificationListener() {
-            @Override
-            public void onClick(Ack ack) {
-                logger.debug("onClick for notification");
-            }
-
-            @Override
-            public void onClose(Ack ack) {
-                logger.debug("onClose for notification");
-                onCloseLatch.countDown();
-            }
-
-            @Override
-            public void onDismiss(Ack ack) {
-                logger.debug("onDismiss for notification");
-                onCloseLatch.countDown();
-            }
-
-            @Override
-            public void onError(Ack ack) {
-                logger.error("onError for notification");
-            }
-
-            @Override
-            public void onMessage(Ack ack) {
-                logger.debug("onMessage for notification");
-            }
-
-            @Override
-            public void onShow(Ack ack) {
-                logger.debug("onShow for notification");
-                onShowLatch.countDown();
-            }
-        }, desktopConnection, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(ack.getReason());
-                fail("onError");
-            }
-        });
-
-        onShowLatch.await(5, TimeUnit.SECONDS);
-        onCloseLatch.await(5, TimeUnit.SECONDS);
-        assertEquals(onShowLatch.getCount(), 0);
-        assertEquals(onCloseLatch.getCount(), 0);
-    }
-    
-    @Test
-    public void sendMessage() throws Exception {
-        CountDownLatch latch = new CountDownLatch(1);
-        NotificationOptions options = new NotificationOptions(notification_url);
-        options.setMessage(new JSONObject("{message: \"JSONMessage\"}"));
-        //options.setMessageText("Notification Text");
-        options.setTimeout(1000);
-        
-        NotificationListener nListener = new NotificationListener() {
-
-			@Override
-			public void onClick(Ack ack) {
-			}
-
-			@Override
-			public void onClose(Ack ack) {
-			}
-
-			@Override
-			public void onDismiss(Ack ack) {
-			}
-
-			@Override
-			public void onError(Ack ack) {
-                logger.error("onError for notification");
-			}
-
-			@Override
-			public void onMessage(Ack ack) {
-                logger.info("onMessage");
-				latch.countDown();
-			}
-
-			@Override
-			public void onShow(Ack ack) {
-			}
-		};
-
-		AckListener ackListener = new AckListener() {
-			@Override
-			public void onSuccess(Ack ack) {
-			}
-
-			@Override
-			public void onError(Ack ack) {
-                logger.error(ack.getReason());
-			}
-		};
-		
-        Notification n = new Notification(options, nListener, desktopConnection, ackListener);
-        n.sendMessage(new JSONObject("{message: \"JSONMessage2\"}"), new AckListener() {
-
-			@Override
-			public void onSuccess(Ack ack) {
-				latch.countDown();
-			}
-
-			@Override
-			public void onError(Ack ack) {
-                logger.error("onError for sendMessage");
-			}
-		});
-        latch.await(10, TimeUnit.SECONDS);
-        assertEquals(0, latch.getCount());
-
-    }
 }
diff --git a/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java b/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java
index 4bc7c75..a741f7a 100644
--- a/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java
+++ b/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java
@@ -12,6 +12,7 @@
 import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,7 +49,7 @@ public static void teardown() throws Exception {
     public void getDeviceId() throws Exception {
         logger.debug("start getDeviceId");
         CountDownLatch latch = new CountDownLatch(1);
-        runtime.getDeviceId(new AckListener() {
+        runtime.getMachineId(new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
@@ -398,6 +399,8 @@ public void onError(Ack ack) {
         }
     }
 
+    // this test does not work anymore with Secure By Default in place
+    @Ignore
     @Test
     public void startAndTerminateExternalProcess() throws Exception {
         CountDownLatch startLatch = new CountDownLatch(1);
@@ -534,4 +537,27 @@ public void duplicateConnectionUuid() throws Exception {
         Thread.sleep(5000);
         assertEquals("Duplicate connection UUID should not be allowed", setupFailed, true);
     }
+    
+    @Test
+    public void getEntityInfo() throws Exception {
+		CountDownLatch latch = new CountDownLatch(1);
+		runtime.getEntityInfo(DESKTOP_UUID, DESKTOP_UUID, new AckListener() {
+
+			@Override
+			public void onSuccess(Ack ack) {
+				JSONObject jsonData = (JSONObject) ack.getData();
+				String uuid = jsonData.getString("uuid");
+				String entityType = jsonData.getString("entityType");
+				if (DESKTOP_UUID.equals(uuid) && "external connection".equals(entityType)) {
+					latch.countDown();
+				}
+			}
+
+			@Override
+			public void onError(Ack ack) {
+			}
+		});
+		latch.await(5, TimeUnit.SECONDS);
+		assertEquals("getEntityInfo timeout", latch.getCount(), 0);
+    }
 }
diff --git a/src/test/java/com/openfin/desktop/SnapshotTest.java b/src/test/java/com/openfin/desktop/SnapshotTest.java
new file mode 100644
index 0000000..d3513e1
--- /dev/null
+++ b/src/test/java/com/openfin/desktop/SnapshotTest.java
@@ -0,0 +1,120 @@
+package com.openfin.desktop;
+
+import com.openfin.desktop.snapshot.SnapshotSourceProvider;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class SnapshotTest implements SnapshotSourceProvider {
+
+    private static Logger logger = LoggerFactory.getLogger(SnapshotTest.class.getName());
+
+    private static final String DESKTOP_UUID = SnapshotTest.class.getName();
+    private static DesktopConnection desktopConnection;
+    private static OpenFinRuntime runtime;
+    private static final JSONObject SNAPSHOT_CONTENT = new JSONObject("{width: 123}");
+
+    private JSONObject randomSnapshot;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        logger.debug("starting");
+        desktopConnection = TestUtils.setupConnection(DESKTOP_UUID);
+        if (desktopConnection != null) {
+            runtime = new OpenFinRuntime(desktopConnection);
+        }
+    }
+
+    @AfterClass
+    public static void teardown() throws Exception {
+        TestUtils.teardownDesktopConnection(desktopConnection);
+    }
+
+    @Test
+    public void initProviderThenCreateClient() throws Exception {
+        CountDownLatch latch = new CountDownLatch(2);
+        final String appUuid = "initProviderThenCreateClient";
+        desktopConnection.getSnapshotSource().initSnapshotSourceProviderAsync(appUuid, this).thenAccept(provider -> {
+            logger.debug("Snapshot provider created");
+            latch.countDown();
+        });
+        desktopConnection.getSnapshotSource().createSnapshotSourceClientAsync(appUuid).thenAccept(client -> {
+            logger.debug("Snapshot client created");
+            latch.countDown();
+        });
+
+        latch.await(5, TimeUnit.SECONDS);
+
+        assertEquals("initProviderThenCreateClient timeout", latch.getCount(), 0);
+    }
+
+    @Test
+    public void initProviderThenCreateClientThenGetSnapshot() throws Exception {
+        CountDownLatch latch = new CountDownLatch(2);
+        final String appUuid = "initProviderThenCreateClientThenGetSnapshot";
+        desktopConnection.getSnapshotSource().initSnapshotSourceProviderAsync(appUuid, this).thenAccept(provider -> {
+            logger.debug("Snapshot provider created");
+                latch.countDown();
+        });
+
+        desktopConnection.getSnapshotSource().createSnapshotSourceClientAsync(appUuid).thenAccept(client -> {
+            client.getSnapshotAsync().thenAccept(snapshot -> {
+                if (SNAPSHOT_CONTENT.toString().equals(snapshot.toString())) {
+                    latch.countDown();
+                }
+            });
+        });
+
+        latch.await(5, TimeUnit.SECONDS);
+
+        assertEquals("initProviderThenCreateClientThenGetSnapshot timeout", latch.getCount(), 0);
+    }
+
+    @Test
+    public void initProviderThenCreateClientThenApplySnapshot() throws Exception {
+        CountDownLatch latch = new CountDownLatch(2);
+        final JSONObject random = new JSONObject(String.format("{value: %f}", Math.random()));
+        final String appUuid = "initProviderThenCreateClientThenApplySnapshot";
+        desktopConnection.getSnapshotSource().initSnapshotSourceProviderAsync(appUuid, this).thenAccept(provider -> {
+            latch.countDown();
+        });
+
+        desktopConnection.getSnapshotSource().createSnapshotSourceClientAsync(appUuid).thenAccept(client -> {
+            client.applySnapshotAsync(random).thenAccept(ack -> {
+                client.getSnapshotAsync().thenAccept(snapshot -> {
+                    if (random.toString().equals(snapshot.toString())) {
+                        latch.countDown();
+                    }
+                });
+
+            });
+        });
+
+        latch.await(5, TimeUnit.SECONDS);
+
+        assertEquals("initProviderThenCreateClientThenGetSnapshot timeout", latch.getCount(), 0);
+    }
+
+    @Override
+    public JSONObject getSnapshot() {
+        if (this.randomSnapshot != null) {
+            return this.randomSnapshot;
+        } else {
+            return SNAPSHOT_CONTENT;
+        }
+    }
+
+    @Override
+    public void applySnapshot(JSONObject snapshot) {
+        this.randomSnapshot = snapshot;
+    }
+}
diff --git a/src/test/java/com/openfin/desktop/SystemTest.java b/src/test/java/com/openfin/desktop/SystemTest.java
index 66015cd..135e02d 100644
--- a/src/test/java/com/openfin/desktop/SystemTest.java
+++ b/src/test/java/com/openfin/desktop/SystemTest.java
@@ -50,7 +50,7 @@ public static void teardown() throws Exception {
     @Test
     public void getDeviceId() throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
-        runtime.getDeviceId(new AckListener() {
+        runtime.getMachineId(new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
@@ -393,6 +393,8 @@ public void onError(Ack ack) {
         }
     }
 
+    // this test does not work anymore with Secure By Default in place
+    @Ignore
     @Test
     public void startAndTerminateExternalProcess() throws Exception {
         CountDownLatch startLatch = new CountDownLatch(1);
@@ -463,7 +465,6 @@ public void onError(Ack ack) {
         assertEquals("getEnvironmentVariables timeout", latch.getCount(), 0);
     }
 
-    @Ignore
     @Test
     public void deleteCacheOnRestart() throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
@@ -513,34 +514,6 @@ public void restartRuntime() throws Exception {
         assertEquals(version1, version2);
     }
 
-    @Test
-    public void customRdmAssetUrls() throws Exception {
-        TestUtils.teardownDesktopConnection(desktopConnection);
-        String rdmUrl    = "https://rdm.openfin.co/services";
-        String assetsUrl = "https://cdn.openfin.co/release";
-        desktopConnection = TestUtils.setupConnection(DESKTOP_UUID, rdmUrl, assetsUrl);
-        runtime = new OpenFinRuntime(desktopConnection);
-        CountDownLatch latch = new CountDownLatch(1);
-        runtime.getConfig(null, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    JSONObject data = (JSONObject) ack.getData();
-                    if (rdmUrl.equals(data.getString("rdmUrl")) && assetsUrl.equals(data.getString("assetsUrl"))) {
-                        latch.countDown();
-                    }
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(ack.getReason());
-            }
-        });
-        latch.await(5, TimeUnit.SECONDS);
-        assertEquals("getConfig timeout", latch.getCount(), 0);
-
-    }
-
     @Test
     public void getRuntimeInfo() throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
diff --git a/src/test/java/com/openfin/desktop/TestUtils.java b/src/test/java/com/openfin/desktop/TestUtils.java
index 5ad83c2..a60b4c8 100644
--- a/src/test/java/com/openfin/desktop/TestUtils.java
+++ b/src/test/java/com/openfin/desktop/TestUtils.java
@@ -38,9 +38,6 @@ public class TestUtils {
         logger.debug(String.format("Runtime version %s", runtimeVersion));
     }
 
-    public static DesktopConnection setupConnection(String connectionUuid) throws Exception {
-        return setupConnection(connectionUuid, null, null);
-    }
     public static DesktopConnection setupConnection(String connectionUuid, RuntimeConfiguration configuration) throws Exception {
         logger.debug("starting from Runtime configuration");
         CountDownLatch connectedLatch = new CountDownLatch(1);
@@ -99,7 +96,7 @@ public void onOutgoingMessage(String message) {
         return desktopConnection;
     }
 
-    public static DesktopConnection setupConnection(String connectionUuid, String rdmUrl, String assetsUrl) throws Exception {
+    public static DesktopConnection setupConnection(String connectionUuid) throws Exception {
         logger.debug("starting");
         CountDownLatch connectedLatch = new CountDownLatch(1);
         disconnectedLatch = new CountDownLatch(1);
@@ -113,13 +110,12 @@ public static DesktopConnection setupConnection(String connectionUuid, String rd
         DesktopConnection desktopConnection = new DesktopConnection(connectionUuid);
         RuntimeConfiguration configuration = new RuntimeConfiguration();
         configuration.setRuntimeVersion(runtimeVersion);
+        configuration.setMaxMessageSize(738320);
         String args = java.lang.System.getProperty("com.openfin.test.runtime.additionalRuntimeArguments");
         if (args != null) {
             configuration.setAdditionalRuntimeArguments(args);
         }
         configuration.setDevToolsPort(9090);
-        configuration.setRdmURL(rdmUrl);
-        configuration.setRuntimeAssetURL(assetsUrl);
         configuration.setLicenseKey("JavaAdapterJUnitTests");
         desktopConnection.connect(configuration, new DesktopStateListener() {
             @Override
@@ -303,15 +299,7 @@ public void eventReceived(ActionEvent actionEvent) {
         };
         addEventListener(application, "closed", listener);
 
-        application.close(new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(ack.getReason());
-            }
-        });
+        application.close();
         stoppedLatch.await(5, TimeUnit.SECONDS);
         assertEquals("Close application timeout " + application.getUuid(), stoppedLatch.getCount(), 0);
     }
@@ -450,4 +438,12 @@ public void onError(Ack ack) {
         assertEquals("getMonitorInfo timeout", latch.getCount(), 0);
         return windowBoundsAtomicReference.get();
     }
+
+    public static void pause(int milliSeconds) {
+        try {
+            Thread.sleep(milliSeconds);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/test/java/com/openfin/desktop/WindowPositionTest.java b/src/test/java/com/openfin/desktop/WindowPositionTest.java
index 4bfcee0..f26143e 100644
--- a/src/test/java/com/openfin/desktop/WindowPositionTest.java
+++ b/src/test/java/com/openfin/desktop/WindowPositionTest.java
@@ -59,10 +59,9 @@ public static void teardown() throws Exception {
         TestUtils.teardownDesktopConnection(desktopConnection);
     }
 
-    @Ignore("for now")
     @Test
     public void saveWindowStateWithRuntimeRestart() throws Exception {
-        int repeat = 30;
+        int repeat = 3;
         String value = java.lang.System.getProperty("com.openfin.desktop.WindowPositionTest.repeat");
         if (value != null) {
             repeat = Integer.parseInt(value);
diff --git a/src/test/java/com/openfin/desktop/WindowTest.java b/src/test/java/com/openfin/desktop/WindowTest.java
index 75c085d..6e65f60 100644
--- a/src/test/java/com/openfin/desktop/WindowTest.java
+++ b/src/test/java/com/openfin/desktop/WindowTest.java
@@ -31,7 +31,7 @@ public class WindowTest {
 
     private static final String DESKTOP_UUID = WindowTest.class.getName();
     private static DesktopConnection desktopConnection;
-    private static final String child_window_url = "http://test.openf.in/test.html";  // simple test app
+    private static final String guest_url = "https://example.com/";
 
     @BeforeClass
     public static void setup() throws Exception {
@@ -213,85 +213,6 @@ public void onError(Ack ack) {
         TestUtils.closeApplication(application);
     }
 
-    @Test
-    public void dockAndUndock() throws Exception {
-        String childName = "docking test";
-        Application application = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);
-        Window mainWindow = application.getWindow();
-        WindowOptions childOptions = TestUtils.getWindowOptions(childName, child_window_url);
-        Window childWindow = TestUtils.createChildWindow(application, childOptions, desktopConnection);
-        WindowBounds beforeMoveBounds = TestUtils.getBounds(childWindow);
-        CountDownLatch joinLatch = new CountDownLatch(1);
-        childWindow.joinGroup(mainWindow, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    joinLatch.countDown();
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(String.format("onError %s", ack.getReason()));
-            }
-        });
-        joinLatch.await(3, TimeUnit.SECONDS);
-        assertEquals(joinLatch.getCount(), 0);
-
-        CountDownLatch groupInfoLatch = new CountDownLatch(2);
-        mainWindow.getGroup(result -> {
-            for (Window window : result) {
-                if (window.getUuid().equals(mainWindow.getUuid()) && window.getName().equals(mainWindow.getName())) {
-                    groupInfoLatch.countDown();
-                }
-                else if (window.getUuid().equals(childWindow.getUuid()) && window.getName().equals(childWindow.getName())) {
-                    groupInfoLatch.countDown();
-                }
-            }
-        }, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-            }
-        });
-        groupInfoLatch.await(3, TimeUnit.SECONDS);
-        assertEquals(groupInfoLatch.getCount(), 0);
-
-        int leftBy = 20, topBy = 30;
-        TestUtils.moveWindowBy(mainWindow, leftBy, topBy);
-        // child window sohuld move with main window since they are docked
-        WindowBounds afterMoveBounds = TestUtils.getBounds(childWindow);
-        int topAfterDockMove = afterMoveBounds.getTop(), leftAfterDockMove = afterMoveBounds.getLeft();
-        assertEquals(afterMoveBounds.getTop() - beforeMoveBounds.getTop(), topBy);
-        assertEquals(afterMoveBounds.getLeft() - beforeMoveBounds.getLeft(), leftBy);
-
-        // undock by leaving the group
-        CountDownLatch undockLatch = new CountDownLatch(1);
-        childWindow.leaveGroup(new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    undockLatch.countDown();
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(String.format("onError %s", ack.getReason()));
-            }
-        });
-        undockLatch.await(5, TimeUnit.SECONDS);
-        assertEquals(undockLatch.getCount(), 0);
-        TestUtils.moveWindowBy(mainWindow, leftBy, topBy);
-        // child window should not move afer leaving group
-        afterMoveBounds = TestUtils.getBounds(childWindow);
-        assertEquals(afterMoveBounds.getLeft().intValue(), leftAfterDockMove);
-        assertEquals(afterMoveBounds.getTop().intValue(), topAfterDockMove);
-
-        TestUtils.closeApplication(application);
-    }
-
-
     @Test
     public void animateMove() throws Exception {
         ApplicationOptions options = TestUtils.getAppOptions(null);
@@ -452,7 +373,7 @@ public void navigate() throws Exception {
         Application application = TestUtils.runApplication(options, desktopConnection);
         Window window = application.getWindow();
         CountDownLatch latch = new CountDownLatch(1);
-        window.navigate("https://openfin.co", new AckListener() {
+        window.navigate(guest_url, new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
@@ -466,9 +387,9 @@ public void onError(Ack ack) {
 
         latch.await(5, TimeUnit.SECONDS);
         assertEquals("Window.navigate timeout", latch.getCount(), 0);
-        Thread.sleep(1000); // give time for https://openfin.co to load
+        Thread.sleep(1000); // give time for guest_url to load
         window.executeJavaScript("location.href", result -> {
-            if (result != null && result.toString().equals("https://openfin.co")) {
+            if (result != null && result.toString().equals(guest_url)) {
                 latch.countDown();
             }
         }, null);
@@ -483,46 +404,13 @@ public void navigateBack() throws Exception {
         ApplicationOptions options = TestUtils.getAppOptions(null);
         Application application = TestUtils.runApplication(options, desktopConnection);
         Window window = application.getWindow();
-        CountDownLatch latch = new CountDownLatch(1);
-        window.navigate("https://openfin.co", new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                	window.navigate("https://www.google.com", new AckListener() {
-                        @Override
-                        public void onSuccess(Ack ack) {
-                            if (ack.isSuccessful()) {
-                            	window.navigateBack(new AckListener() {
-                                    @Override
-                                    public void onSuccess(Ack ack) {
-                                        if (ack.isSuccessful()) {
-                                            if (ack.isSuccessful()) {
-                                                latch.countDown();
-                                            }
-                                        }
-                                    }
-                                    @Override
-                                    public void onError(Ack ack) {
-                                    }
-                                });
-                            }
-                        }
-                        @Override
-                        public void onError(Ack ack) {
-                        }
-                    });
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-            }
-        });
+        CountDownLatch latch = new CountDownLatch(2);
+        navigateAndWaitForContent(window, guest_url);
+        navigateAndWaitForContent(window, "https://google.com");
+        navigateHistoryAndWaitForContent(window, -1, latch);
 
-        latch.await(5, TimeUnit.SECONDS);
-        assertEquals("Window.navigate timeout", latch.getCount(), 0);
-        Thread.sleep(1000); // give time for https://openfin.co to load
         window.executeJavaScript("location.href", result -> {
-            if (result != null && result.toString().equals("https://openfin.co")) {
+            if (result != null && result.toString().equals(guest_url)) {
                 latch.countDown();
             }
         }, null);
@@ -537,54 +425,15 @@ public void navigateForward() throws Exception {
         ApplicationOptions options = TestUtils.getAppOptions(null);
         Application application = TestUtils.runApplication(options, desktopConnection);
         Window window = application.getWindow();
-        CountDownLatch latch = new CountDownLatch(1);
-        window.navigate("https://www.google.com", new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                	window.navigate("https://openfin.co", new AckListener() {
-                        @Override
-                        public void onSuccess(Ack ack) {
-                            if (ack.isSuccessful()) {
-                            	window.navigateBack(new AckListener() {
-                                    @Override
-                                    public void onSuccess(Ack ack) {
-                                        if (ack.isSuccessful()) {
-                                        	window.navigateForward(new AckListener() {
-                                                @Override
-                                                public void onSuccess(Ack ack) {
-                                                    if (ack.isSuccessful()) {
-                                                        latch.countDown();
-                                                    }
-                                                }
-                                                @Override
-                                                public void onError(Ack ack) {
-                                                }
-                                            });
-                                        }
-                                    }
-                                    @Override
-                                    public void onError(Ack ack) {
-                                    }
-                                });
-                            }
-                        }
-                        @Override
-                        public void onError(Ack ack) {
-                        }
-                    });
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-            }
-        });
+        CountDownLatch latch = new CountDownLatch(3);
+        navigateAndWaitForContent(window, "https://google.com");
+        navigateAndWaitForContent(window, guest_url);
+        navigateHistoryAndWaitForContent(window, -1, latch);
+        navigateHistoryAndWaitForContent(window, 1, latch);
 
-        latch.await(5, TimeUnit.SECONDS);
-        assertEquals("Window.navigate timeout", latch.getCount(), 0);
-        Thread.sleep(1000); // give time for https://openfin.co to load
         window.executeJavaScript("location.href", result -> {
-            if (result != null && result.toString().equals("https://openfin.co")) {
+            logger.info(String.format("location.ref %s ", result.toString()));
+            if (result != null && result.toString().equals(guest_url)) {
                 latch.countDown();
             }
         }, null);
@@ -594,13 +443,51 @@ public void onError(Ack ack) {
         TestUtils.closeApplication(application);
     }
 
+    private void navigateAndWaitForContent(Window window, String url) throws Exception {
+        String eventType = "dom-content-loaded";
+        CountDownLatch latch = new CountDownLatch(1);
+        EventListener listener = new EventListener() {
+            @Override
+            public void eventReceived(ActionEvent actionEvent) {
+                if (eventType.equals(actionEvent.getType())) {
+                    latch.countDown();
+                }
+            }
+        };
+        TestUtils.addEventListener(window, eventType, listener);
+        window.navigate(url, null);
+        latch.await(5, TimeUnit.SECONDS);
+        window.removeEventListener(eventType, listener, null);
+        assertEquals("waitForWindowEvent timeout", latch.getCount(), 0);
+    }
+
+    private void navigateHistoryAndWaitForContent(Window window, int direction, CountDownLatch latch) throws Exception {
+        String eventType = "dom-content-loaded";
+        EventListener listener = new EventListener() {
+            @Override
+            public void eventReceived(ActionEvent actionEvent) {
+                if (eventType.equals(actionEvent.getType())) {
+                    latch.countDown();
+                }
+            }
+        };
+        TestUtils.addEventListener(window, "dom-content-loaded", listener);
+        if (direction < 0) {
+            window.navigateBack(null);
+        } else {
+            window.navigateForward(null);
+        }
+        latch.await(5, TimeUnit.SECONDS);
+        window.removeEventListener(eventType, listener, null);
+    }
+
     @Test
     public void stopNavigate() throws Exception {
         ApplicationOptions options = TestUtils.getAppOptions(null);
         Application application = TestUtils.runApplication(options, desktopConnection);
         Window window = application.getWindow();
         CountDownLatch latch = new CountDownLatch(1);
-        window.navigate("https://openfin.co", new AckListener() {
+        window.navigate(guest_url, new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
@@ -628,7 +515,7 @@ public void onError(Ack ack) {
         assertEquals("Window.navigate timeout", latch.getCount(), 0);
         Thread.sleep(1000);
         window.executeJavaScript("location.href", result -> {
-            if (result != null && result.toString().equals("https://openfin.co")) {
+            if (result != null && result.toString().equals(guest_url)) {
                 latch.countDown();
             }
         }, null);
@@ -698,6 +585,10 @@ public void onError(Ack ack) {
 
 			@Override
 			public void onError(Ack ack) {
+			    // starting 13.76.43.x, Runtime rejects setBounds with numbers > max height/width
+			    if (ack.getReason().contains("Proposed window bounds violate size constraints")) {
+                    latch.countDown();
+                }
 			}
         	
         });
@@ -751,7 +642,6 @@ public void onError(Ack ack) {
 		TestUtils.closeApplication(application);
 	}
 
-	@Ignore
 	@Test
 	public void getSetZoomLevel() throws Exception {
 		double level = -1.5;