diff --git a/.circleci/config.yml b/.circleci/config.yml
index 434024b..baf5f12 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,16 +1,61 @@
 version: 2.1
 workflows:
-  build_and_test:
+  version: 2.1
+  build_circleci:
     jobs:
       - build
-
-
+      - initialise:
+          requires:
+            - build
+      - docker-build-and-push:
+          requires:
+            - initialise
+      - back-deploy-heroku:
+          requires:
+            - docker-build-and-push
 jobs:
   build:
     docker:
       - image: circleci/python:3.6.2-stretch-browsers
     steps:
       - checkout
-      - run: export CONDUIT_SECRET='something-really-secret'
-      - run: export FLASK_APP=autoapp.py
-      - run: export FLASK_DEBUG=1
\ No newline at end of file
+      - run:
+          name: install pyth dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip3 install -r requirements/dev.txt
+      - save_cache:
+          paths:
+            - ./venv
+          key: v2-dependencies-{{ checksum "requirements/dev.txt" }}
+  initialise:
+    docker:
+      - image: circleci/python:3.6.2-stretch-browsers
+        environment:
+          DATABASE_URL: postgresql://myuser:somePwd@localhost:5432/myuser
+      - image: circleci/postgres:9.6.5
+        environment:
+          POSTGRES_DB: myuser
+          POSTGRES_USER: myuser
+          POSTGRES_PASSWORD: somePwd
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-dependencies-{{ checksum "requirements/dev.txt" }}
+            - v2-dependencies-
+      - run:
+          name: flask upgrade
+          command: |
+            . venv/bin/activate
+            sleep 1
+            flask db upgrade
+      - run:
+          name: flask test
+          command: |
+            . venv/bin/activate
+            sleep 1
+            flask test
+
+            
\ No newline at end of file