diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..497107ce5b
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,41 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:7.10
+      
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - ENCRYPTION_LABEL1="b5c2730599da"
+      - ENCRYPTION_LABEL2="85f76a180658"
+      - ENCRYPTION_LABEL3="1b1c118ea62d"
+      - COMMIT_AUTHOR_EMAIL="chris@ethereum.org"
+      - COMMIT_AUTHOR="Circle CI"
+      - FILES_TO_PACKAGE="assets background.js build icon.png index.html manifest.json README.md soljson.js"
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+      - run: npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run setupremix && npm run build
+      - run: ./ci/browser_tests.sh
+      - deploy:
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+                ./ci/deploy_from_travis_master.sh
+            fi
+     - deploy:
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
+                ./ci/deploy_from_travis_remix-live.sh
+            fi
+
+    
+     
\ No newline at end of file