diff --git a/index.js b/index.js
index 7d96902..5898741 100644
--- a/index.js
+++ b/index.js
@@ -2,12 +2,6 @@ const webExtension = require('sdk/webextension');
 const {ContextualIdentityService} = require('resource://gre/modules/ContextualIdentityService.jsm');
 
 function handleWebExtensionMessage(message, sender, sendReply) {
-  console.log(message);
-  if (message === 'get-identities') {
-    sendReply({
-      content: {identities: ContextualIdentityService.getIdentities()}
-    });
-  }
 }
 
 webExtension.startup().then(api=> {
diff --git a/webextension-experiment/api.js b/webextension-experiment/api.js
index 15404c9..9dab86f 100644
--- a/webextension-experiment/api.js
+++ b/webextension-experiment/api.js
@@ -2,6 +2,9 @@
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+const CONTAINER_STORE = "firefox-container-";
+
 XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
                                   "resource://gre/modules/ContextualIdentityService.jsm");
 
@@ -16,6 +19,10 @@ function convert(identity) {
   return result;
 }
 
+function getCookieStoreIdForContainer(containerId) {
+  return CONTAINER_STORE + containerId;
+}
+
 class API extends ExtensionAPI {
   getAPI(context) {
     let self = {
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 013dca1..f22da15 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -1,12 +1,5 @@
-const IDENTITY_L10NID_MATCH_INDEX = 1;
-
-browser.runtime.sendMessage('get-identities').then(reply=> {
-  if (reply) {
-    reply.content.identities.forEach(identity=> {
-      const identityName = identity.l10nID.match(/userContext(\w*)\.label/)[IDENTITY_L10NID_MATCH_INDEX];
-
-      document.querySelector('.identities-list').innerHTML += `<li><a href="#">${identityName}</a></li>`;
-    });
-    console.log('response from sdk addon: ', reply.content);
-  }
+browser.contextualIdentities.query({}).then((identites) => {
+  identites.forEach((identity) => {
+    document.querySelector('.identities-list').innerHTML += `<li><a href="#">${identity.icon} ${identity.name}</a></li>`;
+  });
 });