 +  "sandbox": {
 +    "pages": [ "wcs_sandbox.html" ]
    }
+ }
 diff --git a/remoting/webapp/remoting.js b/remoting/webapp/remoting.js
-index a8ab35b..9c6df35 100644
+index f89072a..2fadd83 100644
 --- a/remoting.js
 +++ b/remoting.js
-@@ -39,10 +47,7 @@ remoting.init = function() {
-   l10n.localize();
+@@ -43,10 +43,7 @@ remoting.init = function() {
    // Create global objects.
+   remoting.settings = new remoting.Settings();
    remoting.oauth2 = new remoting.OAuth2();
 -  // TODO(jamiewalch): Reinstate this when we migrate to apps v2
 -  // (http://crbug.com/ 134213).

       this.tableRow.addEventListener('click', this.onConnectReference_, false);
     }
diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html
index 26fa487..d69f54e 100644
--- a/main.html
+++ b/main.html
@@ -31,6 +31,7 @@ found in the LICENSE file.
     <script src="host_screen.js"></script>
     <script src="host_session.js"></script>
     <script src="host_table_entry.js"></script>
+    <script src="identity.js"></script>
     <script src="l10n.js"></script>
     <script src="log_to_server.js"></script>
     <script src="menu_button.js"></script>
diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
index a52b1da..fdae490 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,25 +2,19 @@
   "description": "__MSG_PRODUCT_DESCRIPTION__",
   "default_locale": "en",
-  "app": {
-    "launch": {
-      "local_path": "main.html"
+  "app" : {
+    "background": {
+      "scripts": ["background.js"]
     }
   },
+  "key": "chromotingappsv2",
   "icons": {
     "128": "chromoting128.png",
     "48": "chromoting48.png",
     "16": "chromoting16.png"
   },
-  "content_scripts": [
-    {

-      "js": [ "cs_oauth2_trampoline.js" ]
-    }
-  ],
-  "content_security_policy": "default-src 'self'; script-src 'self' TALK_GADGET_HOST; style-src 'self' https://fonts.googleapis.com; img-src 'self' TALK_GADGET_HOST; font-src *; connect-src 'self' OAUTH2_ACCOUNTS_HOST GOOGLE_API_HOSTS TALK_GADGET_HOST https://relay.google.com",
   "permissions": [
     "OAUTH2_ACCOUNTS_HOST/*",
     "OAUTH2_API_BASE_URL/*",
@@ -30,17 +22,22 @@
     "TALK_GADGET_HOST/talkgadget/*",
     "https://relay.google.com/*",
     "clipboardRead",
-    "clipboardWrite"
-  ],
-  "plugins": [
-    { "path": "remoting_host_plugin.dll", "public": false },
-    { "path": "libremoting_host_plugin.ia32.so", "public": false },
-    { "path": "libremoting_host_plugin.x64.so", "public": false },
-    { "path": "remoting_host_plugin.plugin", "public": false }
+    "clipboardWrite",
+    "experimental",
+    "storage"
   ],
+  "oauth2": {
+    "client_id": "45833509441.apps.googleusercontent.com",
+    "scopes": [
