diff --git a/circle.yml b/circle.yml
index 2b4dbe8d..7fd182c8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,27 +1,66 @@
-machine:
-  post:
-    - pyenv global 2.7.12 3.6.2
-dependencies:
-  pre:
-    - pip install --upgrade pip
-    - pip3 install --upgrade pip
-    - pip install hacking
-    - pip3 install hacking
-general:
-  branches:
-    ignore:
-      - ggmaster
-      - hots
-      - jonomon
-      - master
-      - old_master
-test:
-  override:
-    - python2.7 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-    - python2.7 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - python2.7 -m python -m unittest discover test_replays
-    - python2.7 -m python -m unittest discover test_s2gs
-    - python3.6 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-    - python3.6 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - python3.6 -m python -m unittest discover test_replays
-    - python3.6 -m python -m unittest discover test_s2gs
+version: 2
+jobs:
+  Python2:
+    build:
+      # working_directory: ~/sc2reader
+      docker:
+        - image: python:2.7.13
+      branches:
+        ignore:
+          - ggmaster
+          - hots
+          - jonomon
+          - master
+          - old_master
+      steps:
+        - checkout
+        - run:
+            name: Flake8 and unittests on Python 2.7.13
+            command: |
+              # pip install virtualenv
+              # virtualenv sc2reader
+              # pwd
+              # ls
+              # cd sc2reader
+              # source bin/activate
+              pwd
+              ls
+              python -V
+              pip -V
+              pip install hacking Pillow
+              echo "Flake8 round one"
+              python -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+              echo "Flake8 round two"
+              python -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+              echo "Unittest round one"
+              python -m unittest discover test_replays
+              echo "Unittest round two"
+              python -m unittest discover test_s2gs
+              echo "Done."
+  Python3:
+    build:
+      working_directory: ~/sc2reader
+      docker:
+        - image: python:3.6.2
+      branches:
+        ignore:
+          - ggmaster
+          - hots
+          - jonomon
+          - master
+          - old_master
+      steps:
+        - checkout
+        - run:
+            name: Flake8 and unittests on Python 3.6.2
+            command: |
+              python -m venv venv
+              . venv/bin/activate
+              pwd
+              python -V
+              pip -V
+              pip install hacking Pillow
+              python -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+              python -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+              python -m unittest discover test_replays
+              python -m unittest discover test_s2gs
diff --git a/circle.yml_old_v1 b/circle.yml_old_v1
new file mode 100644
index 00000000..54960748
--- /dev/null
+++ b/circle.yml_old_v1
@@ -0,0 +1,29 @@
+machine:
+  post:
+    - pyenv global 2.7 3.5.0
+dependencies:
+  pre:
+    - pip install --upgrade pip
+    - pip3 install --upgrade pip
+    - pip install hacking
+    - pip3 install hacking
+general:
+  branches:
+    ignore:
+      - ggmaster
+      - hots
+      - jonomon
+      - master
+      - old_master
+test:
+  override:
+    - python2 -V
+    - python2 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    - python2 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - python2 -m unittest discover test_replays
+    - python2 -m unittest discover test_s2gs
+    - python3 -V
+    - python3 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    - python3 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - python3 -m unittest discover test_replays
+    - python3 -m unittest discover test_s2gs