diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..958bf687
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,84 @@
+version: 2
+
+refs:
+  container: &container
+    docker:
+      - image: node:8.11
+    working_directory: ~/repo
+  steps:
+    - &Versions
+      run:
+        name: Versions
+        command: node -v && npm -v && yarn -v
+    - &Install
+      run:
+        name: Install Dependencies
+        command: yarn install --pure-lockfile
+    - &Build
+      run:
+        name: Build
+        command: yarn build
+    - &Build_Storybook
+      run:
+        name: Build Storybook
+        command: yarn storybook:build
+    - &Test
+      run:
+        name: Test
+        command: yarn test
+    - &Upload_Storybook
+      run:
+        name: Upload Storybook
+        command: yarn storybook:upload
+    - &Release
+      run:
+        name: Release
+        command: yarn release
+    - &Commit_Status_Storybook
+      run:
+        name: Post commit status for Storybook
+        command: npx commit-status success Storybook "link..."
+
+jobs:
+  all:
+    <<: *container
+    steps:
+      - checkout
+      - *Versions
+      - *Install
+      - *Build
+      - *Build_Storybook
+      - *Test
+      - *Commit_Status_Storybook
+
+  master:
+    <<: *container
+    steps:
+      - checkout
+      - *Versions
+      - *Install
+      - *Build
+      - *Build_Storybook
+      - *Test
+      - *Commit_Status_Storybook
+      - *Upload_Storybook
+      - *Release
+
+workflows:
+  version: 2
+  all:
+    jobs:
+      - all:
+          context: common-env-vars
+          filters:
+            branches:
+              ignore:
+                - master
+                - gh-pages
+  master:
+    jobs:
+      - master:
+          context: common-env-vars
+          filters:
+            branches:
+              only: master
diff --git a/package.json b/package.json
index 75a97cbb..b8fc2642 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "typings": "lib/index.d.ts",
   "scripts": {
     "start": "yarn storybook",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo hmm...",
     "build": "tsc",
     "clean": "rimraf lib storybook-static",
     "storybook": "start-storybook -p 6008",