diff --git a/.env.example b/.env.example
index 178000046..24dd3951a 100644
--- a/.env.example
+++ b/.env.example
@@ -5,19 +5,30 @@
 #
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
+APPLICATION_URL=http://localhost:3000
+
 # Rollbar for application monitoring
 ROLLBAR_ACCESS_TOKEN=ROLLBAR_ACCESS_TOKEN
 ROLLBAR_ENV=development
 
 DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-development
-REDIS_CACHE_URL=redis://localhost:6379/1
-REDIS_SIDEKIQ_URL=redis://localhost:6379/2
+REDIS_URL=redis://localhost:6379
 
 # Contentful
 CONTENTFUL_URL=cdn.contentful.com
 CONTENTFUL_SPACE=
 CONTENTFUL_ENVIRONMENT=master
 CONTENTFUL_ACCESS_TOKEN=
-CONTENTFUL_PLANNING_START_ENTRY_ID=
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
+
+# API
+CONTENTFUL_WEBHOOK_API_KEY=
+
+# DfE Sign-in
+DFE_SIGN_IN_ISSUER=https://test-oidc.signin.education.gov.uk:443
+DFE_SIGN_IN_IDENTIFIER=buyforyourschool
+DFE_SIGN_IN_SECRET=
+DFE_SIGN_IN_REDIRECT_URL=http://localhost:3000/auth/dfe/callback
+DFE_SIGN_IN_ENABLED=true
diff --git a/.env.test b/.env.test
index 3a665ad35..763f048ec 100644
--- a/.env.test
+++ b/.env.test
@@ -5,15 +5,19 @@
 #
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
+APPLICATION_URL=http://localhost:3000
+
 DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-test
-REDIS_CACHE_URL=redis://localhost:6379/11
-REDIS_SIDEKIQ_URL=redis://localhost:6379/12
+REDIS_URL=redis://localhost:6379
 
 # Contentful
 CONTENTFUL_URL=cdn.contentful.com
 CONTENTFUL_SPACE=test
 CONTENTFUL_ENVIRONMENT=master
 CONTENTFUL_ACCESS_TOKEN=123
-CONTENTFUL_PLANNING_START_ENTRY_ID=contentful-starting-step
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID=contentful-category-entry
+
+# API
+CONTENTFUL_WEBHOOK_API_KEY=
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cab7aa143..7133c9c46 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,3 +9,5 @@
 ### After
 
 ## Next steps
+
+<!-- - [] Document this change in [Confluence](https://dfedigital.atlassian.net/wiki/spaces/GHBFS) -->
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 821bbe6c4..da57487dc 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -16,4 +16,4 @@ jobs:
       - name: Build
         run: docker-compose -f docker-compose.ci.yml build
       - name: Test
-        run: docker-compose -f docker-compose.ci.yml run --rm test bundle exec rake
+        run: docker-compose -f docker-compose.ci.yml run --rm test script/test
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 000000000..cf10214e6
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,58 @@
+name: deploy
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+env:
+  GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
+  GHCR_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
+  GHCR_REPO: "ghcr.io/dfe-digital/buy-for-your-school"
+  CF_USER: ${{ secrets.CF_USER }}
+  CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  GITHUB_SECRETS_JSON: ${{ toJson(secrets) }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      tf_var_docker_image: ${{ steps.tf_var_docker_image.outputs.value }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set Docker tag environment variable
+        run: echo "DOCKER_TAG=${GITHUB_RUN_ID}-${GITHUB_SHA}" >> $GITHUB_ENV
+      - name: Set Docker Image environment variable
+        run: echo "DOCKER_IMAGE=$GHCR_REPO:$DOCKER_TAG" >> $GITHUB_ENV
+      - name: Set TFVAR Docker Image environment variable
+        run: echo "TF_VAR_docker_image=$DOCKER_IMAGE" >> $GITHUB_ENV
+      - name: Set TFVAR Docker Image output
+        id: tf_var_docker_image
+        run: echo "::set-output name=value::$TF_VAR_docker_image"
+      - name: Build
+        run: script/docker-push-ghcr
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set TFVAR Docker Image environment variable
+        run: echo "TF_VAR_docker_image=${{needs.build.outputs.tf_var_docker_image}}" >> $GITHUB_ENV
+      - name: Deploy terraform to staging
+        env:
+          TF_VAR_environment: "staging"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/develop'
+      - name: Deploy terraform to prod
+        env:
+          TF_VAR_environment: "prod"
+        run: |
+          script/deploy-terraform
+        if: github.ref == 'refs/heads/main'
diff --git a/.gitignore b/.gitignore
index bedb8d661..bdfde7431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ rerun.txt
 pickle-email-*.html
 .zeus.sock
 /node_modules
+/spec/examples.txt
 
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
@@ -92,3 +93,22 @@ config/master.key
 .env.*
 !.env.example
 !.env.test
+
+# Terraform files
+**/.terraform/*
+*.tfstate
+*.tfstate.*
+crash.log
+*.tfvars
+.terraformrc
+terraform.rc
+
+# Data dumps (might lead to accidental data breach)
+*.dump
+*.sql
+*.csv
+*.xls
+
+# App env yaml files
+*_app_env.yml
+*_app_env.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c96cc783..4c99389af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,56 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
+## [release-006] - 2021-04-01
+
+- specification templates are now sourced from the Contentful Category entry
+- refactor how we find all journey answers into isolated service
+- users are now told how they can resume a journey, and an address is provided for this
+- robots.txt now excludes all journey and step pages
+- steps/questions/tasks in the task lists are now grouped by Contentful Section entries
+- start page now has revised copy with details on eligibility and what to expect
+- The journey map is now clearer about what happens when you click a link
+- The journey map now includes links to preview a step
+- The journey map now displays markup to include a step's answer in the specification template
+- users can answer questions which expect a number
+- checkbox questions no longer alter the capitalisation of options
+- fix ordering of section and step items
+- users can answer questions which expect a currency
+- questions can be hidden from view
+- specification warning if there are incomplete tasks
+- hidden questions can be shown through a new show_additional_question field for each question
+- hidden questions can be rehidden again after changing the original answer
+- hidden questions that were at one point answered, will be reshown with a change to an earlier question
+- fix Redis connection errors on Heroku
+- users can be asked extended checkbox questions which ask for further information
+- markdown in help text fields is now parsed into HTML
+- show and hide more than one additional question at a time
+- users can be presenting with forking/branching question chains based on any one answer
+- create an extended further information text box option for radio answers
+- create extended further information text box option for checkbox answers
+- radio questions can be configured with an "or" separator
+- specification can show further information for radio answers
+- specification can show further information for checkbox answers
+- checkbox answers can be completed without choosing a given answer
+- fix planning page link back to the service
+- checkbox answers are not automatically joined by commas for the specification
+- answer data is all available through the single `answer_x` convention, this has replaced `extended_answer_x` which has now been removed
+- checkbox answers that are skipped can be identified in the specification
+- fix branching so multiple rules can show the same question
+- the specification lives on it's own page, separate to the task list
+- fix checkbox questions where further information couldn't be saved for an option that included a special character
+- further information for options that include special characters is now available to the specification
+- incomplete specification documents include a warning within the document as well as the file name
+- users return to the same place in the task list after answering a question
+- fix extended radio questions so that further_information can be remembered when it can be provided through multiple fields
+- flash messages can be shown in notification banners
+- fix checkbox answer to save choices after previously skipping
+- users can sign in using DfE Sign-in
+- users can sign out using DfE Sign-in
+- add new dashboard page with the ability to create new specifications
+- users can only see their past journeys from the dashboard
+- new API endpoint to allow Contentful to invalidate cached entries, allowing caching to stay on which prevents the app from being very slow/crashing on journey start
+
 ## [release-005] - 2021-1-19
 
 - users can see an initial slice of their specification as HTML at the end of their journey
@@ -50,20 +100,21 @@ The format is based on [Keep a Changelog 1.0.0].
 ## [release-001] - 2020-11-12
 
 - address rails-template TODO
-- any user can see a start page for the planning journey
+- any user can see a start page for the specifying journey
 - use GOV.UK Frontend framework
-- users can see a basic form to start the planning journey sourced by a
+- users can see a basic form to start the specifying journey sourced by a
 Contentful fixture
-- planning form is styled as a GOV.UK form
+- specifying form is styled as a GOV.UK form
 - validate that an answer is provided to a question
-- the first planning question comes directly from Contentful
+- the first specifying question comes directly from Contentful
 - handle the exceptional case when a Contentful entry is missing
 - multiple radio questions can be answered in sequence
 - users can be asked to answer a short text question
 - Contentful can redirect users to preview endpoints
 - users can be asked to answer a long text question
 
-[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...HEAD
+[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-006...HEAD
+[release-006]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...release-006
 [release-005]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...release-005
 [release-004]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-003...release-004
 [release-003]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-002...release-003
diff --git a/Dockerfile b/Dockerfile
index f9f1aa3e9..a07a6abd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,22 @@ RUN bundle config set no-cache "true"
 RUN bundle config set with $BUNDLE_GEM_GROUPS
 RUN bundle install --no-binstubs --retry=3 --jobs=4
 
-COPY . .
+# Copy app code (sorted by vague frequency of change for caching)
+RUN mkdir -p ${INSTALL_PATH}/log
+RUN mkdir -p ${INSTALL_PATH}/tmp
+
+COPY config.ru ${INSTALL_PATH}/config.ru
+COPY Rakefile ${INSTALL_PATH}/Rakefile
+
+COPY public ${INSTALL_PATH}/public
+COPY vendor ${INSTALL_PATH}/vendor
+COPY bin ${INSTALL_PATH}/bin
+COPY lib ${INSTALL_PATH}/lib
+COPY config ${INSTALL_PATH}/config
+COPY db ${INSTALL_PATH}/db
+COPY script ${INSTALL_PATH}/script
+COPY app ${INSTALL_PATH}/app
+# End
 
 # RELEASE STAGE #
 FROM ruby:2.6.6 AS release
diff --git a/Gemfile b/Gemfile
index 9f4980330..a38027de5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,21 +8,25 @@ gem "bootsnap", ">= 1.1.0", require: false
 gem "climate_control"
 gem "coffee-rails", "~> 5.0"
 gem "contentful", "~> 2.15"
-gem "govuk_design_system_formbuilder", "~> 2.1"
+gem "govuk_design_system_formbuilder", "~> 2.2"
 gem "high_voltage"
 gem "htmltoword"
-gem "jbuilder", "~> 2.5"
+gem "jbuilder", "~> 2.11"
 gem "jquery-rails"
 gem "liquid"
 gem "pg"
 gem "mini_racer"
-gem "puma", "~> 5.1"
+gem "omniauth"
+gem "omniauth_openid_connect"
+gem "omniauth-rails_csrf_protection"
+gem "puma", "~> 5.2"
+gem "redcarpet", "~> 3.5"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
-gem "rails", "~> 6.1.1"
+gem "rails", "~> 6.1.3"
 gem "sass-rails", "~> 6.0"
-gem "sidekiq", "~> 6.1"
+gem "sidekiq", "~> 6.2"
 gem "sidekiq-cron", "~> 1.2"
 gem "turbolinks", "~> 5"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index 506206498..47c8f9ba6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,60 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.1)
-      actionpack (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.1)
-      actionpack (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activestorage (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activesupport (= 6.1.1)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.1)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -62,30 +62,33 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    aes_key_wrap (1.1.0)
+    ast (2.4.2)
+    attr_required (1.0.1)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+    bindata (2.4.8)
     bindex (0.8.1)
-    bootsnap (1.5.1)
+    bootsnap (1.7.3)
       msgpack (~> 1.0)
-    brakeman (4.10.1)
+    brakeman (5.0.0)
     builder (3.2.4)
-    bullet (6.1.2)
+    bullet (6.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
-    climate_control (0.2.0)
+    climate_control (1.0.0)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -94,7 +97,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
     contentful (2.15.4)
       http (> 0.8, < 5.0)
@@ -102,7 +105,12 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    database_cleaner (1.8.5)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     diff-lcs (1.4.4)
     docile (1.3.4)
     domain_name (0.5.20190701)
@@ -120,7 +128,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.15.1)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     ffi (1.14.2)
     ffi-compiler (1.0.1)
@@ -131,11 +139,12 @@ GEM
       raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    govuk_design_system_formbuilder (2.1.6)
-      actionview (~> 6.1.0, >= 6.1)
-      activemodel (~> 6.1.0, >= 6.1)
-      activesupport (~> 6.1.0, >= 6.1)
+    govuk_design_system_formbuilder (2.2.0)
+      actionview (>= 5.2)
+      activemodel (>= 5.2)
+      activesupport (>= 5.2)
     hashdiff (1.0.1)
+    hashie (4.1.0)
     high_voltage (3.1.2)
     htmltoword (1.1.1)
       actionpack
@@ -151,14 +160,19 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.8.7)
+    httpclient (2.8.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json-jwt (1.13.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (8.4.255.0)
@@ -166,57 +180,81 @@ GEM
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
-    minitest (5.14.3)
+    minitest (5.14.4)
     mock_redis (0.27.3)
       ruby2_keywords
-    msgpack (1.3.3)
+    msgpack (1.4.2)
     multi_json (1.15.0)
-    nio4r (2.5.4)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+    omniauth-rails_csrf_protection (0.1.2)
+      actionpack (>= 4.2)
+      omniauth (>= 1.3.1)
+    omniauth_openid_connect (0.3.5)
+      addressable (~> 2.5)
+      omniauth (~> 1.9)
+      openid_connect (~> 1.1)
+    openid_connect (1.2.0)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.5.0)
+      rack-oauth2 (>= 1.6.1)
+      swd (>= 1.0.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (>= 1.0.1)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.1.1)
+    puma (5.2.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.5.2)
     rack (2.2.3)
+    rack-oauth2 (1.16.0)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.1)
-      actioncable (= 6.1.1)
-      actionmailbox (= 6.1.1)
-      actionmailer (= 6.1.1)
-      actionpack (= 6.1.1)
-      actiontext (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activemodel (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.1)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -224,9 +262,9 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails_layout (1.0.42)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
@@ -235,41 +273,42 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redcarpet (3.5.1)
     redis (4.2.5)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    regexp_parser (1.8.2)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rollbar (3.1.1)
+    rollbar (3.1.2)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.1)
-    rubocop (1.7.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
+    rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -288,9 +327,9 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    shoulda-matchers (4.5.0)
+    shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.1.2)
+    sidekiq (6.2.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -316,10 +355,14 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.11.0)
-      rubocop (= 1.7.0)
-      rubocop-performance (= 1.9.2)
-    thor (1.0.1)
+    standard (1.0.4)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.1)
+    swd (1.2.0)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
+    thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -331,14 +374,23 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
-    uniform_notifier (1.13.0)
+    unicode-display_width (2.0.0)
+    uniform_notifier (1.14.0)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.13)
+      activemodel (>= 3.0.0)
+      public_suffix
     web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.11.1)
+    webfinger (1.1.0)
+      activesupport
+      httpclient (>= 2.4)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -366,21 +418,25 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   faker
-  govuk_design_system_formbuilder (~> 2.1)
+  govuk_design_system_formbuilder (~> 2.2)
   high_voltage
   htmltoword
-  jbuilder (~> 2.5)
+  jbuilder (~> 2.11)
   jquery-rails
   launchy
   liquid
   listen (>= 3.0.5, < 3.5)
   mini_racer
   mock_redis
+  omniauth
+  omniauth-rails_csrf_protection
+  omniauth_openid_connect
   pg
   pry
-  puma (~> 5.1)
-  rails (~> 6.1.1)
+  puma (~> 5.2)
+  rails (~> 6.1.3)
   rails_layout
+  redcarpet (~> 3.5)
   redis (~> 4.2)
   redis-namespace
   rollbar
@@ -388,7 +444,7 @@ DEPENDENCIES
   sass-rails (~> 6.0)
   selenium-webdriver
   shoulda-matchers
-  sidekiq (~> 6.1)
+  sidekiq (~> 6.2)
   sidekiq-cron (~> 1.2)
   simplecov
   spring
diff --git a/LICENCE b/LICENCE
new file mode 100644
index 000000000..afbb37ee8
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Crown Copyright (Department for Education)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 8459fcf2e..3974d5cf8 100644
--- a/README.md
+++ b/README.md
@@ -2,64 +2,10 @@
 
 A service to help school buying professionals create tender documents that comply with the relevant government policy. These tender documents can then be used to start a procurement process saving schools time and money.
 
-## Getting started
-
-1. [Install Docker for Mac](https://docs.docker.com/docker-for-mac/install/)
-1. copy `/.env.example` into `/.env.development.local`.
-
-  Our intention is that the example should include enough to get the application started quickly. If this is not the case, please ask another developer for a copy of their `/.env.development.local` file.
-
-1. `script/server`
-1. Visit http://localhost:3000
-
-## Running the tests
-
-### The whole test suite
-
-* Using Docker has high parity, you don't have to install any dependencies but it takes longer to run (~20 seconds):
-
-    ```bash
-    docker-compose -f docker-compose.test.yml run --rm test bundle exec rake
-    ```
-* Without Docker is faster (~5 seconds) but has lower parity and you will need to install local dependencies on your machine first:
-
-    ```bash
-    brew install postgres
-    brew services start postgres
-    brew install redis
-    brew services start redis
-    createuser postgres --super
-    rbenv install 2.6.6 && rbenv local 2.6.6
-    gem install bundle && bundle
-    RAILS_ENV=test rake db:setup
-    ```
-    ```ruby
-    script/test
-    ```
-
-### RSpec only
-
-```
-bundle exec rspec spec/*
-```
-
-## Starting a Rails console
-
-```
-script/console
-```
-
-## Running Brakeman
-
-Run [Brakeman](https://brakemanscanner.org/) to highlight any security vulnerabilities:
-```bash
-brakeman
-```
-
-To pipe the results to a file:
-```bash
-brakeman -o report.text
-```
+1. [Getting started](/doc/getting-started.md)
+1. [Release process](/doc/release-process.md)
+1. [Managing environment variables](/doc/managing-environment-variables.md)
+1. [DfE Sign-in](/doc/dfe-sign-in.md)
 
 ## Making changes
 
@@ -67,27 +13,12 @@ When making a change, update the [changelog](CHANGELOG.md) using the
 [Keep a Changelog 1.0.0](https://keepachangelog.com/en/1.0.0/) format. Pull
 requests should not be merged before any relevant updates are made.
 
-## Releasing changes
-
-When making a new release, follow the [release process](doc/release-process.md).
-
 ## Architecture decision records
 
 We use ADRs to document architectural decisions that we make. They can be found
 in doc/architecture/decisions and contributed to with the
 [adr-tools](https://github.com/npryce/adr-tools).
 
-## Managing environment variables
-
-We use [Dotenv](https://github.com/bkeepers/dotenv) to manage our environment variables locally.
-
-The repository will include safe defaults for development in `/.env.example` and for test in `/.env.test`. We use 'example' instead of 'development' (from the Dotenv docs) to be consistent with current dxw conventions and to make it more explicit that these values are not to be committed.
-
-To manage sensitive environment variables:
-
-1. Add the new key and safe default value to the `/.env.example` file eg. `ROLLBAR_TOKEN=ROLLBAR_TOKEN`
-2. Add the new key and real value to your local `/.env.development.local` file, which should never be checked into Git. This file will look something like `ROLLBAR_TOKEN=123456789`
-
 ## Access
 
 TODO: Where can people find the service and the different environments?
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 745f9c959..e4526c6e9 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -1,43 +1,47 @@
 # frozen_string_literal: true
 
 class AnswersController < ApplicationController
+  before_action :check_user_belongs_to_journey?
+
+  include DateHelper
+  include AnswerHelper
+
   def create
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @step = Step.find(step_id)
+    @step_presenter = StepPresenter.new(@step)
 
     @answer = AnswerFactory.new(step: @step).call
     @answer.step = @step
 
-    case @step.contentful_type
-    when "checkboxes"
-      @answer.assign_attributes(checkbox_params)
-    else
-      @answer.assign_attributes(answer_params)
-    end
+    result = SaveAnswer.new(answer: @answer).call(
+      further_information_params: further_information_params,
+      answer_params: answer_params,
+      date_params: date_params
+    )
+    @answer = result.object
 
-    if @answer.valid?
-      @answer.save
-      redirect_to journey_path(@journey)
+    if result.success?
+      redirect_to journey_path(@journey, anchor: @step.id)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/new_form_wrapper"}
     end
   end
 
   def update
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
     @step = Step.find(step_id)
-    @answer = @step.answer
+    @step_presenter = StepPresenter.new(@step)
 
-    case @step.contentful_type
-    when "checkboxes"
-      @answer.assign_attributes(checkbox_params)
-    else
-      @answer.assign_attributes(answer_params)
-    end
+    result = SaveAnswer.new(answer: @step.answer).call(
+      further_information_params: further_information_params,
+      answer_params: answer_params,
+      date_params: date_params
+    )
+    @answer = result.object
 
-    if @answer.valid?
-      @answer.save
-      redirect_to journey_path(@journey)
+    if result.success?
+      redirect_to journey_path(@journey, anchor: @step.id)
     else
       render "steps/#{@step.contentful_type}", locals: {layout: "steps/edit_form_wrapper"}
     end
@@ -57,7 +61,38 @@ def answer_params
     params.require(:answer).permit(:response, :further_information)
   end
 
-  def checkbox_params
-    params.require(:answer).permit(response: [])
+  def further_information_params
+    return {skipped: true, response: [""], further_information: nil} if skip_answer?
+
+    answer_params = params.require(:answer)
+
+    if @step.options
+      allowed_further_information_keys = @step.options.map { |option|
+        key = machine_readable_option(string: option["value"])
+        "#{key}_further_information".to_sym
+      }
+    end
+
+    further_information_params = answer_params.permit(*allowed_further_information_keys)
+    further_information = further_information_params.to_hash
+
+    all_params = answer_params.permit(:response, response: [])
+    all_params[:further_information] = further_information
+
+    if @step.contentful_type == "checkboxes"
+      all_params[:skipped] = false
+    end
+
+    all_params
+  end
+
+  def date_params
+    answer = params.require(:answer).permit(:response)
+    date_hash = {day: answer["response(3i)"], month: answer["response(2i)"], year: answer["response(1i)"]}
+    {response: format_date(date_hash)}
+  end
+
+  def skip_answer?
+    params.fetch("skip", false)
   end
 end
diff --git a/app/controllers/api/contentful/entries_controller.rb b/app/controllers/api/contentful/entries_controller.rb
new file mode 100644
index 000000000..a791b7591
--- /dev/null
+++ b/app/controllers/api/contentful/entries_controller.rb
@@ -0,0 +1,17 @@
+class Api::Contentful::EntriesController < ApplicationController
+  skip_before_action :authenticate_user!
+  http_basic_authenticate_with name: "api", password: ENV["CONTENTFUL_WEBHOOK_API_KEY"]
+
+  def changed
+    Cache.delete(key: cache_key)
+    render json: {status: "OK"}, status: :ok
+  end
+
+  private def cache_key
+    "contentful:entry:#{changed_params["entityId"]}"
+  end
+
+  private def changed_params
+    params.permit("entityId")
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ce505faf3..89e441516 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,40 @@
 class ApplicationController < ActionController::Base
   default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
 
+  before_action :authenticate_user!, except: :health_check
+
+  protect_from_forgery
+
   def health_check
     render json: {rails: "OK"}, status: :ok
   end
+
+  protected
+
+  helper_method :current_user
+  def current_user
+    @current_user ||= begin
+      user = FindOrCreateUserFromSession.new(session_hash: session.to_hash).call
+      return user if user.present?
+
+      false
+    end
+  end
+
+  def authenticate_user!
+    return if current_user
+
+    session.delete(:dfe_sign_in_uid)
+    redirect_to root_path
+  end
+
+  def current_journey
+    journey_id = params[:journey_id].present? ? params[:journey_id] : params[:id]
+    @current_journey ||= Journey.find(journey_id)
+  end
+
+  def check_user_belongs_to_journey?
+    return true if current_journey.user == current_user
+    render file: "public/404.html", status: :not_found, layout: false
+  end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
new file mode 100644
index 000000000..b5083b3d0
--- /dev/null
+++ b/app/controllers/dashboard_controller.rb
@@ -0,0 +1,4 @@
+class DashboardController < ApplicationController
+  def show
+  end
+end
diff --git a/app/controllers/journey_maps_controller.rb b/app/controllers/journey_maps_controller.rb
index eab7d3d64..9d0e18e45 100644
--- a/app/controllers/journey_maps_controller.rb
+++ b/app/controllers/journey_maps_controller.rb
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 class JourneyMapsController < ApplicationController
-  rescue_from BuildJourneyOrder::RepeatEntryDetected do |exception|
+  rescue_from GetStepsFromSection::RepeatEntryDetected do |exception|
     render "errors/repeat_step_in_the_contentful_journey", status: 500, locals: {error: exception}
   end
 
-  rescue_from BuildJourneyOrder::TooManyChainedEntriesDetected do |exception|
-    render "errors/too_many_steps_in_the_contentful_journey", status: 500, locals: {error: exception}
+  rescue_from GetEntry::EntryNotFound do |exception|
+    render "errors/contentful_entry_not_found", status: 500
   end
 
   def new
-    entries = GetAllContentfulEntries.new.call
-    @journey_map = BuildJourneyOrder.new(
-      entries: entries.to_a,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    sections = GetSectionsFromCategory.new(category: category).call
+    @steps = sections.map { |section|
+      GetStepsFromSection.new(section: section).call
+    }.flatten
   end
 end
diff --git a/app/controllers/journeys_controller.rb b/app/controllers/journeys_controller.rb
index d0ed713e3..da6276b6e 100644
--- a/app/controllers/journeys_controller.rb
+++ b/app/controllers/journeys_controller.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class JourneysController < ApplicationController
-  rescue_from FindLiquidTemplate::InvalidLiquidSyntax do |exception|
+  before_action :check_user_belongs_to_journey?, only: %w[show]
+
+  rescue_from GetCategory::InvalidLiquidSyntax do |exception|
     render "errors/specification_template_invalid", status: 500, locals: {error: exception}
   end
 
@@ -13,47 +15,31 @@ class JourneysController < ApplicationController
     render "errors/unexpected_contentful_step_type", status: 500
   end
 
-  rescue_from BuildJourneyOrder::MissingEntryDetected do |exception|
+  rescue_from GetEntry::EntryNotFound do |exception|
     render "errors/contentful_entry_not_found", status: 500
   end
 
+  def index
+    @journeys = current_user.journeys
+  end
+
   def new
-    journey = CreateJourney.new(category: "catering").call
+    journey = CreateJourney.new(category_name: "catering", user: current_user).call
     redirect_to journey_path(journey)
   end
 
   def show
-    @journey = Journey.includes(
-      steps: [:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers]
-    ).find(journey_id)
-    @steps = @journey.steps.map { |step| StepPresenter.new(step) }
-
-    # TODO: Move this logic into a tested class along with a Presenter factory
-    @answers = @journey.steps.that_are_questions.each_with_object({}) { |step, hash|
-      answer = case step.answer.class.name
-      when "ShortTextAnswer" then ShortTextAnswerPresenter.new(step.answer)
-      when "LongTextAnswer" then LongTextAnswerPresenter.new(step.answer)
-      when "RadioAnswer" then RadioAnswerPresenter.new(step.answer)
-      when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
-      when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
-      else
-        step.answer
-      end
-      hash["answer_#{step.contentful_id}"] = answer&.response.to_s
-    }
-
-    @specification_template = Liquid::Template.parse(
-      @journey.liquid_template, error_mode: :strict
-    )
-
-    specification_html = @specification_template.render(@answers)
-
-    respond_to do |format|
-      format.html
-      format.docx do
-        render docx: "specification.docx", content: specification_html, layout: "specficiation"
-      end
-    end
+    @journey = current_journey
+    @visible_steps = @journey.visible_steps.includes([
+      :radio_answer,
+      :short_text_answer,
+      :long_text_answer,
+      :single_date_answer,
+      :checkbox_answers,
+      :number_answer,
+      :currency_answer
+    ])
+    @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
   end
 
   private
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
new file mode 100644
index 000000000..0f95a026c
--- /dev/null
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,5 @@
+class PagesController < ApplicationController
+  include HighVoltage::StaticPage
+
+  skip_before_action :authenticate_user!
+end
diff --git a/app/controllers/preview/entries_controller.rb b/app/controllers/preview/entries_controller.rb
index dcd4db657..92a660ba2 100644
--- a/app/controllers/preview/entries_controller.rb
+++ b/app/controllers/preview/entries_controller.rb
@@ -1,7 +1,12 @@
 class Preview::EntriesController < ApplicationController
   def show
-    @journey = Journey.create(category: "catering")
-    contentful_entry = GetContentfulEntry.new(entry_id: entry_id).call
+    @journey = Journey.create(
+      category: "catering",
+      user: current_user,
+      liquid_template: "<p>N/A</p>"
+    )
+
+    contentful_entry = GetEntry.new(entry_id: entry_id).call
     @step = CreateJourneyStep.new(
       journey: @journey, contentful_entry: contentful_entry
     ).call
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 000000000..036fa8ae7
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class SessionsController < ApplicationController
+  skip_before_action :authenticate_user!
+  protect_from_forgery except: :bypass_callback
+
+  def create
+    UserSession.new(session: session)
+      .persist_successful_dfe_sign_in_claim!(omniauth_hash: auth_hash)
+
+    redirect_to dashboard_path
+  end
+  alias_method :bypass_callback, :create
+
+  def failure
+    Rollbar.error("Sign in failed unexpectedly")
+  end
+
+  def destroy
+    user_session = UserSession.new(session: session)
+    sign_out_url_copy = user_session.sign_out_url.dup
+
+    user_session.repudiate!
+
+    redirect_to sign_out_url_copy
+  end
+
+  private def auth_hash
+    request.env["omniauth.auth"]
+  end
+end
diff --git a/app/controllers/specifications_controller.rb b/app/controllers/specifications_controller.rb
new file mode 100644
index 000000000..3464f9d08
--- /dev/null
+++ b/app/controllers/specifications_controller.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class SpecificationsController < ApplicationController
+  before_action :check_user_belongs_to_journey?
+
+  def show
+    @journey = current_journey
+    @visible_steps = @journey.visible_steps.includes([
+      :radio_answer,
+      :short_text_answer,
+      :long_text_answer,
+      :single_date_answer,
+      :checkbox_answers,
+      :number_answer,
+      :currency_answer
+    ])
+    @step_presenters = @visible_steps.map { |step| StepPresenter.new(step) }
+
+    specification_renderer = SpecificationRenderer.new(
+      template: @journey.liquid_template,
+      answers: GetAnswersForSteps.new(visible_steps: @visible_steps).call
+    )
+
+    @specification_html = specification_renderer.to_html
+
+    respond_to do |format|
+      format.html
+      format.docx do
+        file_name = @journey.all_steps_completed? ? "specification.docx" : "specification-incomplete.docx"
+        document_html = specification_renderer.to_document_html(journey_complete: @journey.all_steps_completed?)
+
+        render docx: file_name, content: document_html
+      end
+    end
+  end
+
+  private
+
+  def journey_id
+    params[:journey_id]
+  end
+end
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 6984327a4..2e84ee991 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -1,30 +1,25 @@
 # frozen_string_literal: true
 
 class StepsController < ApplicationController
-  def new
-    @journey = Journey.find(journey_id)
-
-    return redirect_to journey_path(@journey) unless @journey.next_entry_id.present?
-
-    contentful_entry = GetContentfulEntry.new(entry_id: @journey.next_entry_id).call
-    @step = CreateJourneyStep.new(
-      journey: @journey, contentful_entry: contentful_entry
-    ).call
-
-    redirect_to journey_step_path(@journey, @step)
-  end
+  before_action :check_user_belongs_to_journey?
 
   def show
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
+
     @step = Step.find(params[:id])
+    @step_presenter = StepPresenter.new(@step)
+
     @answer = AnswerFactory.new(step: @step).call
 
     render @step.contentful_type, locals: {layout: "steps/new_form_wrapper"}
   end
 
   def edit
-    @journey = Journey.find(journey_id)
+    @journey = current_journey
+
     @step = Step.find(params[:id])
+    @step_presenter = StepPresenter.new(@step)
+
     @answer = @step.answer
 
     render "steps/#{@step.contentful_type}", locals: {layout: "steps/edit_form_wrapper"}
diff --git a/app/helpers/answer_helper.rb b/app/helpers/answer_helper.rb
new file mode 100644
index 000000000..62eb143ba
--- /dev/null
+++ b/app/helpers/answer_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AnswerHelper
+  def human_readable_option(string:)
+    string.tr("_", " ").capitalize
+  end
+
+  def machine_readable_option(string:)
+    string.parameterize(separator: "_")
+  end
+end
diff --git a/app/helpers/date_helper.rb b/app/helpers/date_helper.rb
new file mode 100644
index 000000000..31819db75
--- /dev/null
+++ b/app/helpers/date_helper.rb
@@ -0,0 +1,11 @@
+module DateHelper
+  def format_date(params)
+    date_parts = params.values_at(:day, :month, :year)
+    return unless date_parts.all?(&:present?)
+
+    day, month, year = date_parts.map(&:to_i)
+    Date.new(year, month, day)
+  rescue ArgumentError
+    nil
+  end
+end
diff --git a/app/helpers/journey_helper.rb b/app/helpers/journey_helper.rb
new file mode 100644
index 000000000..87e6dbf12
--- /dev/null
+++ b/app/helpers/journey_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module JourneyHelper
+  def section_group_with_steps(journey:, steps:)
+    step_lookup = steps.group_by(&:contentful_id)
+
+    journey.section_groups.each do |section|
+      ordered_step_objects = section["steps"].each_with_object([]) { |step, result|
+        next unless step_lookup[step["contentful_id"]]
+        result[step["order"]] = step_lookup[step["contentful_id"]].first
+      }
+      section["steps"] = ordered_step_objects.compact
+    end
+  end
+end
diff --git a/app/helpers/step_helper.rb b/app/helpers/step_helper.rb
index c67f11950..0f539d1e2 100644
--- a/app/helpers/step_helper.rb
+++ b/app/helpers/step_helper.rb
@@ -3,7 +3,22 @@
 module StepHelper
   def checkbox_options(array_of_options:)
     array_of_options.map { |option|
-      OpenStruct.new(id: option.downcase, name: option.titleize)
+      OpenStruct.new(id: option.downcase, name: option)
     }
   end
+
+  def monkey_patch_form_object_with_further_information_field(
+    form_object:,
+    associated_choice:
+  )
+    existing_further_information = form_object&.further_information&.fetch(
+      "#{associated_choice}_further_information", nil
+    )
+
+    form_object.define_singleton_method("#{associated_choice}_further_information") do
+      existing_further_information
+    end
+
+    form_object
+  end
 end
diff --git a/app/jobs/warm_entry_cache_job.rb b/app/jobs/warm_entry_cache_job.rb
index 3b04dfcbe..362895eff 100644
--- a/app/jobs/warm_entry_cache_job.rb
+++ b/app/jobs/warm_entry_cache_job.rb
@@ -5,16 +5,15 @@ class WarmEntryCacheJob < ApplicationJob
   sidekiq_options retry: 5
 
   def perform
-    entries = BuildJourneyOrder.new(
-      entries: GetAllContentfulEntries.new.call,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    sections = GetSectionsFromCategory.new(category: category).call
+    steps = sections.map { |section| GetStepsFromSection.new(section: section).call }
 
-    entries.each do |entry|
+    # TODO: Cache category and sections too
+    [steps].flatten.each do |entry|
       store_in_cache(cache: cache, key: "contentful:entry:#{entry.id}", entry: entry)
     end
-  rescue BuildJourneyOrder::RepeatEntryDetected,
-    BuildJourneyOrder::TooManyChainedEntriesDetected
+  rescue GetStepsFromSection::RepeatEntryDetected
     cache.extend_ttl_on_all_entries
   end
 
diff --git a/app/models/checkbox_answers.rb b/app/models/checkbox_answers.rb
index c93e5b78d..4c857ea24 100644
--- a/app/models/checkbox_answers.rb
+++ b/app/models/checkbox_answers.rb
@@ -2,7 +2,9 @@ class CheckboxAnswers < ActiveRecord::Base
   self.implicit_order_column = "created_at"
   belongs_to :step
 
-  validates :response, presence: true
+  validates :response,
+    presence: true,
+    unless: proc { |answer| answer.step.skippable? && answer.skipped }
 
   def response=(args)
     return if args.blank?
diff --git a/app/models/currency_answer.rb b/app/models/currency_answer.rb
new file mode 100644
index 000000000..ab422a0f4
--- /dev/null
+++ b/app/models/currency_answer.rb
@@ -0,0 +1,14 @@
+class CurrencyAnswer < ActiveRecord::Base
+  self.implicit_order_column = "created_at"
+  belongs_to :step
+
+  validates :response, presence: true, numericality: {greater_than_or_equal_to: 0, message: "does not accept £ signs or other non numerical characters"}
+
+  def response=(value)
+    if value.is_a?(String)
+      super(value.delete(","))
+      return
+    end
+    super(value)
+  end
+end
diff --git a/app/models/journey.rb b/app/models/journey.rb
index ec827d682..fdc342671 100644
--- a/app/models/journey.rb
+++ b/app/models/journey.rb
@@ -1,6 +1,12 @@
 class Journey < ApplicationRecord
   self.implicit_order_column = "created_at"
   has_many :steps
+  has_many :visible_steps, -> { where(steps: {hidden: false}) }, class_name: "Step"
+  belongs_to :user
 
-  validates :liquid_template, presence: true
+  validates :category, :liquid_template, presence: true
+
+  def all_steps_completed?
+    visible_steps.all? { |step| step.answer.present? }
+  end
 end
diff --git a/app/models/number_answer.rb b/app/models/number_answer.rb
new file mode 100644
index 000000000..b914ce779
--- /dev/null
+++ b/app/models/number_answer.rb
@@ -0,0 +1,6 @@
+class NumberAnswer < ActiveRecord::Base
+  self.implicit_order_column = "created_at"
+  belongs_to :step
+
+  validates :response, presence: true, numericality: {only_integer: true}
+end
diff --git a/app/models/single_date_answer.rb b/app/models/single_date_answer.rb
index b85a192c3..316084f88 100644
--- a/app/models/single_date_answer.rb
+++ b/app/models/single_date_answer.rb
@@ -2,5 +2,5 @@ class SingleDateAnswer < ActiveRecord::Base
   self.implicit_order_column = "created_at"
   belongs_to :step
 
-  validates :response, presence: true
+  validates :response, presence: {message: I18n.t("activerecord.errors.models.single_date_answer.attributes.response")}
 end
diff --git a/app/models/step.rb b/app/models/step.rb
index d1cab14c7..2ee714bcc 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -7,16 +7,22 @@ class Step < ApplicationRecord
   has_one :long_text_answer
   has_one :single_date_answer
   has_one :checkbox_answers
+  has_one :number_answer
+  has_one :currency_answer
 
   scope :that_are_questions, -> { where(contentful_model: "question") }
 
   def answer
     @answer ||=
-      radio_answer ||
-      short_text_answer ||
-      long_text_answer ||
-      single_date_answer ||
-      checkbox_answers
+      case contentful_type
+      when "radios" then radio_answer
+      when "short_text" then short_text_answer
+      when "long_text" then long_text_answer
+      when "single_date" then single_date_answer
+      when "checkboxes" then checkbox_answers
+      when "number" then number_answer
+      when "currency" then currency_answer
+      end
   end
 
   def primary_call_to_action_text
@@ -24,7 +30,7 @@ def primary_call_to_action_text
     super
   end
 
-  def options_list
-    options.map { |hash| hash["value"] }
+  def skippable?
+    skip_call_to_action_text.present?
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 000000000..3fdebdff0
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,5 @@
+class User < ApplicationRecord
+  self.implicit_order_column = "created_at"
+
+  has_many :journeys
+end
diff --git a/app/models/user_session.rb b/app/models/user_session.rb
new file mode 100644
index 000000000..a9d204d20
--- /dev/null
+++ b/app/models/user_session.rb
@@ -0,0 +1,34 @@
+class UserSession
+  include Rails.application.routes.url_helpers
+
+  attr_accessor :session
+
+  def initialize(session:)
+    self.session = session
+  end
+
+  def persist_successful_dfe_sign_in_claim!(omniauth_hash:)
+    session[:dfe_sign_in_uid] = omniauth_hash.fetch("uid")
+    session[:dfe_sign_in_sign_out_token] = omniauth_hash.dig("credentials", "id_token")
+  end
+
+  def repudiate!
+    session.delete(:dfe_sign_in_uid)
+    session.delete(:dfe_sign_in_sign_out_token)
+  end
+
+  def should_be_signed_out_of_dsi?
+    session.key?(:dfe_sign_in_sign_out_token) && !session[:dfe_sign_in_sign_out_token].blank?
+  end
+
+  def sign_out_url
+    return root_path unless should_be_signed_out_of_dsi?
+
+    query = {
+      post_logout_redirect_uri: auth_dfe_signout_url,
+      id_token_hint: session[:dfe_sign_in_sign_out_token]
+    }
+
+    "#{ENV.fetch("DFE_SIGN_IN_ISSUER")}/session/end?#{query.to_query}"
+  end
+end
diff --git a/app/presenters/checkboxes_answer_presenter.rb b/app/presenters/checkboxes_answer_presenter.rb
index 5da1e066a..091f90052 100644
--- a/app/presenters/checkboxes_answer_presenter.rb
+++ b/app/presenters/checkboxes_answer_presenter.rb
@@ -1,5 +1,37 @@
 class CheckboxesAnswerPresenter < SimpleDelegator
+  include AnswerHelper
+
   def response
-    super.reject(&:blank?).map(&:capitalize).join(", ")
+    super.reject(&:blank?)
+  end
+
+  def to_param
+    {
+      response: response,
+      concatenated_response: concatenated_response,
+      skipped: skipped,
+      selected_answers: selected_answers
+    }
+  end
+
+  private def concatenated_response
+    return nil if response.empty?
+
+    response.join(", ")
+  end
+
+  private def selected_answers
+    return [] if response.empty?
+
+    response.each_with_object([]) do |human_readable_choice, array|
+      machine_readable_key = machine_readable_option(string: human_readable_choice).to_sym
+      matching_further_information = further_information&.fetch("#{machine_readable_key}_further_information", nil)
+
+      array << {
+        machine_value: machine_readable_key,
+        human_value: human_readable_choice,
+        further_information: matching_further_information
+      }
+    end
   end
 end
diff --git a/app/presenters/currency_answer_presenter.rb b/app/presenters/currency_answer_presenter.rb
new file mode 100644
index 000000000..a3f175828
--- /dev/null
+++ b/app/presenters/currency_answer_presenter.rb
@@ -0,0 +1,13 @@
+class CurrencyAnswerPresenter < SimpleDelegator
+  include ActionView::Helpers::NumberHelper
+
+  def response
+    number_to_currency(super, unit: "£", precision: 2)
+  end
+
+  def to_param
+    {
+      response: response
+    }
+  end
+end
diff --git a/app/presenters/long_text_answer_presenter.rb b/app/presenters/long_text_answer_presenter.rb
index e16c61fb0..f09fd1e01 100644
--- a/app/presenters/long_text_answer_presenter.rb
+++ b/app/presenters/long_text_answer_presenter.rb
@@ -4,4 +4,10 @@ class LongTextAnswerPresenter < SimpleDelegator
   def response
     simple_format(super)
   end
+
+  def to_param
+    {
+      response: response
+    }
+  end
 end
diff --git a/app/presenters/number_answer_presenter.rb b/app/presenters/number_answer_presenter.rb
new file mode 100644
index 000000000..bfc596819
--- /dev/null
+++ b/app/presenters/number_answer_presenter.rb
@@ -0,0 +1,11 @@
+class NumberAnswerPresenter < SimpleDelegator
+  def response
+    super.to_s
+  end
+
+  def to_param
+    {
+      response: response
+    }
+  end
+end
diff --git a/app/presenters/radio_answer_presenter.rb b/app/presenters/radio_answer_presenter.rb
index 854044543..2d86b7556 100644
--- a/app/presenters/radio_answer_presenter.rb
+++ b/app/presenters/radio_answer_presenter.rb
@@ -1,7 +1,19 @@
 class RadioAnswerPresenter < SimpleDelegator
+  include AnswerHelper
+
   def response
-    return super.capitalize if further_information.blank?
+    human_readable_option(string: super)
+  end
+
+  def to_param
+    {
+      response: response,
+      further_information: further_information
+    }
+  end
 
-    "#{super.capitalize} - #{further_information}"
+  def further_information
+    return unless super
+    super["#{machine_readable_option(string: response)}_further_information"]
   end
 end
diff --git a/app/presenters/short_text_answer_presenter.rb b/app/presenters/short_text_answer_presenter.rb
index fa5bb3496..86701d522 100644
--- a/app/presenters/short_text_answer_presenter.rb
+++ b/app/presenters/short_text_answer_presenter.rb
@@ -1,2 +1,7 @@
 class ShortTextAnswerPresenter < SimpleDelegator
+  def to_param
+    {
+      response: response
+    }
+  end
 end
diff --git a/app/presenters/single_date_answer_presenter.rb b/app/presenters/single_date_answer_presenter.rb
index 1bd0942d7..4a69c2c5d 100644
--- a/app/presenters/single_date_answer_presenter.rb
+++ b/app/presenters/single_date_answer_presenter.rb
@@ -2,4 +2,10 @@ class SingleDateAnswerPresenter < SimpleDelegator
   def response
     I18n.l(super)
   end
+
+  def to_param
+    {
+      response: response
+    }
+  end
 end
diff --git a/app/presenters/step_presenter.rb b/app/presenters/step_presenter.rb
index e018c14d8..c58296bfd 100644
--- a/app/presenters/step_presenter.rb
+++ b/app/presenters/step_presenter.rb
@@ -2,4 +2,9 @@ class StepPresenter < SimpleDelegator
   def question?
     contentful_model == "question"
   end
+
+  def help_text_html
+    return unless help_text.present?
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(help_text).html_safe
+  end
 end
diff --git a/app/services/answer_factory.rb b/app/services/answer_factory.rb
index b42b9392e..f4a70d883 100644
--- a/app/services/answer_factory.rb
+++ b/app/services/answer_factory.rb
@@ -1,4 +1,6 @@
 class AnswerFactory
+  class UnexpectedQuestionType < StandardError; end
+
   attr_accessor :step
 
   def initialize(step:)
@@ -8,10 +10,13 @@ def initialize(step:)
   def call
     case step.contentful_type
     when "radios" then RadioAnswer.new
+    when "number" then NumberAnswer.new
+    when "currency" then CurrencyAnswer.new
     when "short_text" then ShortTextAnswer.new
     when "long_text" then LongTextAnswer.new
     when "single_date" then SingleDateAnswer.new
     when "checkboxes" then CheckboxAnswers.new
+    else raise UnexpectedQuestionType.new "Trying to create answer for unknown question type #{step.contentful_type}"
     end
   end
 end
diff --git a/app/services/build_journey_order.rb b/app/services/build_journey_order.rb
deleted file mode 100644
index 4a5293e4b..000000000
--- a/app/services/build_journey_order.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class BuildJourneyOrder
-  class RepeatEntryDetected < StandardError; end
-
-  class TooManyChainedEntriesDetected < StandardError; end
-
-  class MissingEntryDetected < StandardError; end
-
-  ENTRY_JOURNEY_MAX_LENGTH = 50
-
-  attr_accessor :entries, :starting_entry_id
-
-  def initialize(entries:, starting_entry_id:)
-    self.entries = entries
-    self.starting_entry_id = starting_entry_id
-  end
-
-  def call
-    recursive_path(
-      entry_lookup: entry_lookup_hash,
-      next_entry_id: starting_entry_id,
-      entries: []
-    )
-  end
-
-  private
-
-  def entry_lookup_hash
-    @entry_lookup_hash ||= entries.to_h { |entry| [entry.id, entry] }
-  end
-
-  def recursive_path(entry_lookup:, next_entry_id:, entries:)
-    begin
-      entry = entry_lookup.fetch(next_entry_id)
-    rescue KeyError
-      send_rollbar_error(message: "A specified Contentful entry was not found", entry_id: next_entry_id)
-      raise MissingEntryDetected.new(next_entry_id)
-    end
-
-    if entries.include?(entry)
-      send_rollbar_error(message: "A repeated Contentful entry was found in the same journey", entry_id: entry.id)
-      raise RepeatEntryDetected.new(entry.id)
-    end
-
-    if entries.count >= ENTRY_JOURNEY_MAX_LENGTH
-      send_rollbar_error(message: "More than #{ENTRY_JOURNEY_MAX_LENGTH} steps were found in a journey map", entry_id: entry.id)
-      raise TooManyChainedEntriesDetected.new(entry.id)
-    end
-
-    entries << entry if entry.present?
-
-    if entry.respond_to?(:next)
-      recursive_path(
-        entry_lookup: entry_lookup,
-        next_entry_id: entry.next.id,
-        entries: entries
-      )
-    else
-      entries
-    end
-  end
-
-  def send_rollbar_error(message:, entry_id:)
-    Rollbar.error(
-      message,
-      contentful_url: ENV["CONTENTFUL_URL"],
-      contentful_space_id: ENV["CONTENTFUL_SPACE"],
-      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-      contentful_entry_id: entry_id
-    )
-  end
-end
diff --git a/app/services/cache.rb b/app/services/cache.rb
index 685a35757..874b3fcd7 100644
--- a/app/services/cache.rb
+++ b/app/services/cache.rb
@@ -27,6 +27,10 @@ def set(key:, value:)
     redis_cache.expire(key, ttl)
   end
 
+  def self.delete(key:)
+    RedisCache.redis.del(key)
+  end
+
   def extend_ttl_on_all_entries(extension: (60 * 60 * 24))
     redis_cache.keys("contentful:entry:*").map do |key|
       previous_ttl = redis_cache.ttl(key)
diff --git a/app/services/create_journey.rb b/app/services/create_journey.rb
index 3322af4c8..1011c6ae5 100644
--- a/app/services/create_journey.rb
+++ b/app/services/create_journey.rb
@@ -1,30 +1,44 @@
 class CreateJourney
-  attr_accessor :category
+  attr_accessor :category_name, :user
 
-  def initialize(category:)
-    self.category = category
+  def initialize(category_name:, user:)
+    self.category_name = category_name
+    self.user = user
   end
 
   def call
-    journey = Journey.create(
-      category: category,
-      next_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"],
-      liquid_template: liquid_template
+    category = GetCategory.new(category_entry_id: ENV["CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID"]).call
+    sections = GetSectionsFromCategory.new(category: category).call
+    journey = Journey.new(
+      category: category_name,
+      liquid_template: category.specification_template,
+      user: user
     )
-    entries = GetAllContentfulEntries.new.call
-    question_entries = BuildJourneyOrder.new(
-      entries: entries.to_a,
-      starting_entry_id: ENV["CONTENTFUL_PLANNING_START_ENTRY_ID"]
-    ).call
-    question_entries.each do |entry|
-      CreateJourneyStep.new(
-        journey: journey, contentful_entry: entry
-      ).call
+
+    journey.section_groups = build_section_groupings(sections: sections)
+    journey.save!
+
+    sections.each do |section|
+      question_entries = GetStepsFromSection.new(section: section).call
+      question_entries.each do |entry|
+        CreateJourneyStep.new(
+          journey: journey, contentful_entry: entry
+        ).call
+      end
     end
+
     journey
   end
 
-  private def liquid_template
-    FindLiquidTemplate.new(category: category).call
+  private def build_section_groupings(sections:)
+    sections.each_with_object([]).with_index { |(section, result), index|
+      result[index] = {
+        order: index,
+        title: section.title,
+        steps: section.steps.each_with_object([]).with_index { |(step, result), index|
+          result << {contentful_id: step.id, order: index}
+        }
+      }
+    }
   end
 end
diff --git a/app/services/create_journey_step.rb b/app/services/create_journey_step.rb
index 08c7e0415..b2354254d 100644
--- a/app/services/create_journey_step.rb
+++ b/app/services/create_journey_step.rb
@@ -11,6 +11,8 @@ class UnexpectedContentfulStepType < StandardError; end
     paragraphs
     single_date
     checkboxes
+    number
+    currency
   ].freeze
 
   attr_accessor :journey, :contentful_entry
@@ -30,7 +32,7 @@ def call
       raise UnexpectedContentfulStepType
     end
 
-    step = Step.create(
+    Step.create(
       title: title,
       help_text: help_text,
       body: body,
@@ -39,13 +41,12 @@ def call
       contentful_type: step_type,
       options: options,
       primary_call_to_action_text: primary_call_to_action_text,
+      skip_call_to_action_text: skip_call_to_action_text,
+      hidden: hidden,
+      additional_step_rules: additional_step_rules,
       raw: raw,
       journey: journey
     )
-
-    journey.update(next_entry_id: next_entry_id)
-
-    step
   end
 
   private
@@ -102,13 +103,24 @@ def primary_call_to_action_text
     contentful_entry.primary_call_to_action
   end
 
-  def raw
-    contentful_entry.raw
+  def skip_call_to_action_text
+    return nil unless contentful_entry.respond_to?(:skip_call_to_action)
+    contentful_entry.skip_call_to_action
+  end
+
+  def hidden
+    return false unless contentful_entry.respond_to?(:always_show_the_user)
+    return false if contentful_entry.always_show_the_user.nil?
+    !contentful_entry.always_show_the_user
+  end
+
+  def additional_step_rules
+    return nil unless contentful_entry.respond_to?(:show_additional_question)
+    contentful_entry.show_additional_question
   end
 
-  def next_entry_id
-    return nil unless contentful_entry.respond_to?(:next)
-    contentful_entry.next.id
+  def raw
+    contentful_entry.raw
   end
 
   def send_rollbar_warning
diff --git a/app/services/find_liquid_template.rb b/app/services/find_liquid_template.rb
deleted file mode 100644
index 412667553..000000000
--- a/app/services/find_liquid_template.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class FindLiquidTemplate
-  class InvalidLiquidSyntax < StandardError; end
-
-  attr_accessor :category, :environment
-
-  def initialize(category:, environment: Rails.env)
-    self.category = category
-    self.environment = environment
-  end
-
-  def call
-    validate_liquid
-    file
-  rescue Liquid::SyntaxError => error
-    send_rollbar_error
-    raise InvalidLiquidSyntax.new(message: error.message)
-  end
-
-  private def file
-    @file ||= File.read("lib/specification_templates/#{category}.#{environment}.liquid")
-  end
-
-  private def validate_liquid
-    Liquid::Template.parse(file, error_mode: :strict)
-  end
-
-  private def send_rollbar_error
-    Rollbar.error(
-      "A user couldn't start a journey because of an invalid Specification",
-      contentful_url: ENV["CONTENTFUL_URL"],
-      contentful_space_id: ENV["CONTENTFUL_SPACE"],
-      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-      category: category
-    )
-  end
-end
diff --git a/app/services/find_or_create_user_from_session.rb b/app/services/find_or_create_user_from_session.rb
new file mode 100644
index 000000000..a2fd369c7
--- /dev/null
+++ b/app/services/find_or_create_user_from_session.rb
@@ -0,0 +1,13 @@
+class FindOrCreateUserFromSession
+  attr_accessor :session_hash
+
+  def initialize(session_hash:)
+    self.session_hash = session_hash.with_indifferent_access
+  end
+
+  def call
+    return nil unless session_hash.key?(:dfe_sign_in_uid)
+
+    User.find_or_create_by(dfe_sign_in_uid: session_hash[:dfe_sign_in_uid])
+  end
+end
diff --git a/app/services/get_answers_for_steps.rb b/app/services/get_answers_for_steps.rb
new file mode 100644
index 000000000..5b25111ab
--- /dev/null
+++ b/app/services/get_answers_for_steps.rb
@@ -0,0 +1,29 @@
+class GetAnswersForSteps
+  class UnexpectedAnswer < StandardError; end
+
+  include AnswerHelper
+
+  attr_accessor :visible_steps
+  def initialize(visible_steps:)
+    self.visible_steps = visible_steps
+  end
+
+  def call
+    visible_steps.each_with_object({}) { |step, hash|
+      next unless step.answer
+
+      answer = case step.answer.class.name
+      when "ShortTextAnswer" then ShortTextAnswerPresenter.new(step.answer)
+      when "LongTextAnswer" then LongTextAnswerPresenter.new(step.answer)
+      when "RadioAnswer" then RadioAnswerPresenter.new(step.answer)
+      when "SingleDateAnswer" then SingleDateAnswerPresenter.new(step.answer)
+      when "CheckboxAnswers" then CheckboxesAnswerPresenter.new(step.answer)
+      when "NumberAnswer" then NumberAnswerPresenter.new(step.answer)
+      when "CurrencyAnswer" then CurrencyAnswerPresenter.new(step.answer)
+      else raise UnexpectedAnswer.new("Trying to present an unknown type of answer: #{step.answer.class.name}")
+      end
+
+      hash["answer_#{step.contentful_id}"] = answer.to_param.with_indifferent_access
+    }
+  end
+end
diff --git a/app/services/get_category.rb b/app/services/get_category.rb
new file mode 100644
index 000000000..7e927a5f7
--- /dev/null
+++ b/app/services/get_category.rb
@@ -0,0 +1,42 @@
+class GetCategory
+  class InvalidLiquidSyntax < StandardError; end
+
+  attr_accessor :category_entry_id
+  def initialize(category_entry_id:)
+    self.category_entry_id = category_entry_id
+  end
+
+  def call
+    category = begin
+      GetEntry.new(entry_id: category_entry_id).call
+    rescue GetEntry::EntryNotFound
+      send_rollbar_error(message: "A Contentful category entry was not found", entry_id: category_entry_id)
+      raise
+    end
+
+    begin
+      validate_liquid(template: category.specification_template)
+    rescue Liquid::SyntaxError => error
+      send_rollbar_error(message: "A user couldn't start a journey because of an invalid Specification", entry_id: category_entry_id)
+      raise InvalidLiquidSyntax.new(message: error.message)
+    end
+
+    category
+  end
+
+  private
+
+  def send_rollbar_error(message:, entry_id:)
+    Rollbar.error(
+      message,
+      contentful_url: ENV["CONTENTFUL_URL"],
+      contentful_space_id: ENV["CONTENTFUL_SPACE"],
+      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+      contentful_entry_id: entry_id
+    )
+  end
+
+  def validate_liquid(template:)
+    Liquid::Template.parse(template, error_mode: :strict)
+  end
+end
diff --git a/app/services/get_contentful_entry.rb b/app/services/get_entry.rb
similarity index 97%
rename from app/services/get_contentful_entry.rb
rename to app/services/get_entry.rb
index 304d3d975..c88f5fd9c 100644
--- a/app/services/get_contentful_entry.rb
+++ b/app/services/get_entry.rb
@@ -1,4 +1,4 @@
-class GetContentfulEntry
+class GetEntry
   class EntryNotFound < StandardError; end
   include CacheableEntry
 
diff --git a/app/services/get_sections_from_category.rb b/app/services/get_sections_from_category.rb
new file mode 100644
index 000000000..a49dd4203
--- /dev/null
+++ b/app/services/get_sections_from_category.rb
@@ -0,0 +1,10 @@
+class GetSectionsFromCategory
+  attr_accessor :category
+  def initialize(category:)
+    self.category = category
+  end
+
+  def call
+    category.sections.map { |section| GetEntry.new(entry_id: section.id).call }
+  end
+end
diff --git a/app/services/get_steps_from_section.rb b/app/services/get_steps_from_section.rb
new file mode 100644
index 000000000..33dd1d47b
--- /dev/null
+++ b/app/services/get_steps_from_section.rb
@@ -0,0 +1,36 @@
+class GetStepsFromSection
+  class RepeatEntryDetected < StandardError; end
+
+  attr_accessor :section
+  def initialize(section:)
+    self.section = section
+  end
+
+  def call
+    question_entry_ids = []
+    section.steps.each do |step|
+      if question_entry_ids.include?(step.id)
+        send_rollbar_error(message: "A repeated Contentful entry was found in the same section", entry_id: step.id)
+        raise RepeatEntryDetected.new(step.id)
+      else
+        question_entry_ids << step.id
+      end
+    end
+
+    question_entry_ids.map { |entry_id|
+      GetEntry.new(entry_id: entry_id).call
+    }
+  end
+
+  private
+
+  def send_rollbar_error(message:, entry_id:)
+    Rollbar.error(
+      message,
+      contentful_url: ENV["CONTENTFUL_URL"],
+      contentful_space_id: ENV["CONTENTFUL_SPACE"],
+      contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+      contentful_entry_id: entry_id
+    )
+  end
+end
diff --git a/app/services/result.rb b/app/services/result.rb
new file mode 100644
index 000000000..936eb5a3b
--- /dev/null
+++ b/app/services/result.rb
@@ -0,0 +1,9 @@
+Result = Struct.new(:success, :object, :error_message) {
+  def success?
+    success == true
+  end
+
+  def failure?
+    !success
+  end
+}
diff --git a/app/services/save_answer.rb b/app/services/save_answer.rb
new file mode 100644
index 000000000..925fdb24c
--- /dev/null
+++ b/app/services/save_answer.rb
@@ -0,0 +1,28 @@
+class SaveAnswer
+  attr_accessor :answer, :step
+  def initialize(answer:)
+    self.answer = answer
+    self.step = answer.step
+  end
+
+  def call(answer_params: {}, further_information_params: {}, date_params: {})
+    result = Result.new(false, answer)
+
+    case step.contentful_type
+    when "checkboxes", "radios"
+      answer.assign_attributes(further_information_params)
+    when "single_date"
+      answer.assign_attributes(date_params)
+    else
+      answer.assign_attributes(answer_params)
+    end
+
+    if answer.valid?
+      answer.save
+      ToggleAdditionalSteps.new(step: answer.step).call
+      result.success = true
+    end
+
+    result
+  end
+end
diff --git a/app/services/specification_renderer.rb b/app/services/specification_renderer.rb
new file mode 100644
index 000000000..4bc38fc55
--- /dev/null
+++ b/app/services/specification_renderer.rb
@@ -0,0 +1,20 @@
+class SpecificationRenderer
+  def initialize(template:, answers:)
+    @template = Liquid::Template.parse(
+      template, error_mode: :strict
+    )
+    @answers = answers
+  end
+
+  def to_html
+    @template.render(@answers).html_safe
+  end
+
+  def to_document_html(journey_complete:)
+    document_html = @template.render(@answers)
+    unless journey_complete
+      document_html.prepend(I18n.t("journey.specification.download.warning.incomplete"))
+    end
+    document_html
+  end
+end
diff --git a/app/services/toggle_additional_steps.rb b/app/services/toggle_additional_steps.rb
new file mode 100644
index 000000000..f4eed2766
--- /dev/null
+++ b/app/services/toggle_additional_steps.rb
@@ -0,0 +1,90 @@
+class ToggleAdditionalSteps
+  attr_accessor :journey, :step
+  def initialize(step:)
+    self.journey = step.journey
+    self.step = step
+  end
+
+  def call
+    return unless additional_step_rules
+
+    recursively_hide_additional_steps!(next_steps: additional_steps_to_hide)
+    recursively_show_additional_steps!(current_step: step, next_steps: additional_steps_to_show(step: step))
+  end
+
+  private
+
+  def journey_steps
+    @journey_steps ||= journey.steps
+  end
+
+  def additional_step_rules
+    step.additional_step_rules
+  end
+
+  def additional_step_ids
+    additional_step_rules.map { |rule|
+      rule["question_identifiers"]
+    }.flatten
+  end
+
+  def additional_steps_to_show(step:)
+    matching_next_step_ids = step.additional_step_rules.map { |rule|
+      rule.fetch("question_identifiers", nil) if step.answer && matching_answer?(a: rule["required_answer"], b: step.answer.response)
+    }.flatten
+    journey_steps.where(contentful_id: matching_next_step_ids)
+  end
+
+  def additional_steps_to_hide
+    non_matching_next_step_ids = step.additional_step_rules.map { |rule|
+      rule.fetch("question_identifiers", nil) unless matching_answer?(a: rule["required_answer"], b: step.answer.response)
+    }.flatten
+    journey_steps.where(contentful_id: non_matching_next_step_ids)
+  end
+
+  def matching_answer?(a:, b:)
+    expected_answer = a.downcase
+    case b.class.name
+    when "Array"
+      b.map(&:downcase).include?(expected_answer)
+    else
+      expected_answer == b.downcase
+    end
+  end
+
+  def recursively_hide_additional_steps!(next_steps:)
+    if next_steps
+      next_steps.update_all(hidden: true)
+
+      next_steps.map { |next_step|
+        next unless next_step.additional_step_rules
+
+        all_next_step_ids = next_step.additional_step_rules.map { |rule|
+          rule.fetch("question_identifiers", nil)
+        }.flatten
+        all_next_steps = journey_steps.where(contentful_id: all_next_step_ids)
+
+        recursively_hide_additional_steps!(
+          next_steps: all_next_steps
+        )
+      }
+    end
+  end
+
+  def recursively_show_additional_steps!(current_step:, next_steps:)
+    return unless current_step.answer && current_step.additional_step_rules
+
+    if next_steps
+      next_steps.update_all(hidden: false)
+
+      next_steps.map { |next_step|
+        next unless next_step.additional_step_rules
+
+        recursively_show_additional_steps!(
+          current_step: next_step,
+          next_steps: additional_steps_to_show(step: next_step)
+        )
+      }
+    end
+  end
+end
diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb
new file mode 100644
index 000000000..1aeef628f
--- /dev/null
+++ b/app/views/dashboard/show.html.erb
@@ -0,0 +1,26 @@
+<%= content_for :title, I18n.t("dashboard.header") %>
+<%= link_to I18n.t("generic.button.back"), root_path, class: "govuk-back-link" %>
+
+<div class="govuk-grid-row">
+
+  <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-xl"><%= I18n.t("dashboard.header") %></h1>
+  </div>
+
+  <div class="govuk-grid-column-one-half">
+      <h2 class="govuk-heading-m"><%= I18n.t("dashboard.existing.header") %></h2>
+      <p class="govuk-body"><%= I18n.t("dashboard.existing.body") %></p>
+      <ul class="govuk-list">
+        <li><%= link_to I18n.t("dashboard.existing.link"), journeys_path, class: "govuk-link" %></li>
+      </ul>
+  </div>
+
+  <div class="govuk-grid-column-one-half">
+      <h2 class="govuk-heading-m"><%= I18n.t("dashboard.create.header") %></h2>
+      <p class="govuk-body"><%= I18n.t("dashboard.create.body") %></p>
+      <ul class="govuk-list">
+        <li><a href="start_new-specification" class="govuk-link"><%= link_to I18n.t("dashboard.create.link"), new_journey_path, class: "govuk-link" %></a></li>
+      </ul>
+  </div>
+
+  </div>
diff --git a/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb b/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb
deleted file mode 100644
index f63b298cf..000000000
--- a/app/views/errors/too_many_steps_in_the_contentful_journey.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= content_for :title, I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title") %>
-
-<h1 class="govuk-heading-xl"><%= I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title") %></h1>
-<p class="govuk-body">
-  <%= I18n.t("errors.too_many_steps_in_the_contentful_journey.page_body", entry_id: error.message, step_count: BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH) %>
-</p>
diff --git a/app/views/journey_maps/new.html.erb b/app/views/journey_maps/new.html.erb
index 02268a6b5..d95b3f5ae 100644
--- a/app/views/journey_maps/new.html.erb
+++ b/app/views/journey_maps/new.html.erb
@@ -2,9 +2,14 @@
 <h1 class="govuk-heading-xl"><%= I18n.t("journey_map.page_title") %></h1>
 
 <ol class="govuk-list govuk-list--number">
-  <% @journey_map.each do |entry| %>
-    <li>
-      <%= link_to entry.title, "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %>
+  <% @steps.each do |entry| %>
+    <li class="govuk-!-margin-bottom-4">
+      <b><%= entry.title %></b><br>
+      <small>
+        <%= link_to I18n.t("journey_map.edit_step_link_text"), "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/#{entry.id}", target: :blank, class: "govuk-link" %> &middot;
+        <%= link_to I18n.t("journey_map.preview_step_link_text"), preview_entry_path(entry.id), target: :blank, class: "govuk-link" %><br>
+        <%= I18n.t("journey_map.spec_template_tag_title") %>: <code>{{ answer_<%= entry.id %> }}</code>
+      </small>
     </li>
   <% end %>
 </ol>
diff --git a/app/views/journeys/_resume_journey_notice.html.erb b/app/views/journeys/_resume_journey_notice.html.erb
new file mode 100644
index 000000000..51efe08de
--- /dev/null
+++ b/app/views/journeys/_resume_journey_notice.html.erb
@@ -0,0 +1,15 @@
+<div class="govuk-notification-banner" role="region" id="govuk-recovery-advice-banner" aria-labelledby="govuk-recovery-advice-banner-title" data-module="govuk-notification-banner">
+  <div class="govuk-notification-banner__header">
+    <h2 class="govuk-notification-banner__title" id="govuk-recovery-advice-banner-title">
+      <%= I18n.t("resume.notification.title") %>
+    </h2>
+  </div>
+  <div class="govuk-notification-banner__content">
+    <p class="govuk-body">
+      <%= I18n.t("resume.notification.body") %>
+    </p>
+    <p class="govuk-body">
+      <code><%=journey_url(@journey) %></code>
+    </p>
+  </div>
+</div>
diff --git a/app/views/journeys/_step_list.html.erb b/app/views/journeys/_step_list.html.erb
new file mode 100644
index 000000000..318223bed
--- /dev/null
+++ b/app/views/journeys/_step_list.html.erb
@@ -0,0 +1,19 @@
+<ul class="app-task-list__items">
+  <% steps.each do |step| %>
+    <% if step.question? %>
+    <li class="app-task-list__item", id="<%= step.id %>">
+      <% if step.answer %>
+        <span class="app-task-list__task-name">
+          <%= link_to step.title, edit_journey_step_path(journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
+        </span>
+        <strong class="govuk-tag app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.completed") %></strong>
+      <% else %>
+        <span class="app-task-list__task-name">
+          <%= link_to step.title, journey_step_path(journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
+        </span>
+        <strong class="govuk-tag govuk-tag--grey app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.not_started") %></strong>
+      <% end %>
+    </li>
+    <% end %>
+  <% end %>
+</ul>
diff --git a/app/views/journeys/index.html.erb b/app/views/journeys/index.html.erb
new file mode 100644
index 000000000..106a7646f
--- /dev/null
+++ b/app/views/journeys/index.html.erb
@@ -0,0 +1,21 @@
+<%= content_for :title, I18n.t("journey.index.existing.header") %>
+<%= link_to I18n.t("generic.button.back"), dashboard_path, class: "govuk-back-link" %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("journey.index.existing.header") %></h1>
+
+<table class="govuk-table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header">Date started</th>
+      <th scope="col" class="govuk-table__header govuk-table__cell--numeric"> </th>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% @journeys.each do |journey| %>
+      <tr class="govuk-table__row">
+        <td class="govuk-table__cell"><%= journey.created_at.strftime("%e %B %Y") %></td>
+        <td class="govuk-table__cell govuk-table__cell--numeric"><a href="<%= journey_path(journey) %>" class="govuk-link">Review and edit</a></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/journeys/show.html.erb b/app/views/journeys/show.html.erb
index fc549a8ed..0bbbeeb89 100644
--- a/app/views/journeys/show.html.erb
+++ b/app/views/journeys/show.html.erb
@@ -1,30 +1,17 @@
 <%= content_for :title, @journey.category.capitalize %>
 
-<h1 class="govuk-heading-xl"><%= @journey.category.capitalize %></h1>
+<%= link_to I18n.t("generic.button.back"), dashboard_path, class: "govuk-back-link" %>
+<h1 class="govuk-heading-xl"><%= I18n.t("specifying.start_page.page_title") %></h1>
+
+<%= render "resume_journey_notice" %>
+
 <ol class="app-task-list">
-  <li>
-    <ul class="app-task-list__items">
-      <% @steps.each do |step| %>
-        <% if step.question? %>
-        <li class="app-task-list__item">
-          <% if step.answer %>
-            <span class="app-task-list__task-name">
-              <%= link_to step.title, edit_journey_step_path(@journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
-            </span>
-            <strong class="govuk-tag app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.completed") %></strong>
-          <% else %>
-            <span class="app-task-list__task-name">
-              <%= link_to step.title, journey_step_path(@journey, step), class: "govuk-link", 'aria-describedby': step.id + "-status"%>
-            </span>
-            <strong class="govuk-tag govuk-tag--grey app-task-list__tag" id="<%= step.id + "-status" %>"><%= I18n.t("task_list.status.not_started") %></strong>
-          <% end %>
-        </li>
-        <% end %>
-      <% end %>
-    </ul>
-  </li>
+  <% section_group_with_steps(journey: @journey, steps: @step_presenters).each do |grouping| %>
+    <h2 class="app-task-list__section"><%= grouping["title"] %></h2>
+    <li>
+      <%= render "step_list", journey: @journey, steps: grouping["steps"] %>
+    </li>
+  <% end %>
 </ol>
 
-<h1 class="govuk-heading-l"><%= I18n.t("journey.specification.header") %></h1>
-<%= link_to "Download (.docx)", journey_path(@journey, format: :docx), class: "govuk-button" %>
-<%= @specification_template.render(@answers).html_safe %>
+<%= link_to I18n.t("journey.specification.button"), journey_specification_path(@journey), class: "govuk-button" %>
diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
index 8ec714104..1abeb640b 100644
--- a/app/views/layouts/_messages.html.erb
+++ b/app/views/layouts/_messages.html.erb
@@ -1,9 +1,16 @@
-<% # Rails flash messages styled for Bootstrap 4.0 %>
 <% flash.each do |name, msg| %>
   <% if msg.is_a?(String) %>
-    <div class="alert alert-<%= name.to_s == "notice" ? "success" : "danger" %>" role="alert">
-      <button aria-hidden="true" class="close" data-dismiss="alert" type="button">&times;</button>
-      <%= content_tag :div, msg, id: "flash_#{name}" %>
+    <div class="govuk-notification-banner govuk-notification-banner--<%= name %>" role="alert" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
+      <div class="govuk-notification-banner__header">
+        <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
+          <%= name.capitalize %>
+        </h2>
+      </div>
+      <div class="govuk-notification-banner__content">
+        <h3 class="govuk-notification-banner__heading">
+          <%= content_tag :div, msg, id: "flash_#{name}" %>
+        </h3>
+      </div>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/layouts/_navigation_links.html.erb b/app/views/layouts/_navigation_links.html.erb
index 548d397e5..79b7ff1a8 100644
--- a/app/views/layouts/_navigation_links.html.erb
+++ b/app/views/layouts/_navigation_links.html.erb
@@ -1 +1,9 @@
-<%# add navigation links to this file %>
+<nav class="navbar-component">
+  <ul id="navigation" class="govuk-header__navigation navbar-component__navigation", aria-label="Top level navigation">
+    <% if current_user.present? %>
+      <li class="navbar-component__navigation-item--right govuk-header__navigation-item">
+        <%= link_to I18n.t("generic.button.sign_out"), auth_dfe_signout_path, method: :delete, class: "govuk-header__link" %>
+      </li>
+    <% end %>
+  </ul>
+</nav>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1477ccbd8..e9ec97acb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -51,6 +51,7 @@
           <a class="govuk-header__link govuk-header__link--service-name" href="/">
             <%= I18n.t("app.name") %>
           </a>
+          <%= render "layouts/navigation_links" %>
         </div>
       </div>
     </header>
@@ -67,6 +68,7 @@
         </p>
       </div>
       <main class="govuk-main-wrapper " id="main-content" role="main">
+        <%= render partial: "layouts/messages" %>
         <%= yield %>
       </main>
     </div>
diff --git a/app/views/pages/planning_start_page.html.erb b/app/views/pages/planning_start_page.html.erb
index 20cf4f34f..dca08cdab 100644
--- a/app/views/pages/planning_start_page.html.erb
+++ b/app/views/pages/planning_start_page.html.erb
@@ -1,18 +1,284 @@
 <%= content_for :title, I18n.t("planning.start_page.page_title") %>
+<%= link_to I18n.t("generic.button.back"), root_path, class: "govuk-back-link" %>
 
 <h1 class="govuk-heading-xl"><%= I18n.t("planning.start_page.page_title") %></h1>
 
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.overview_title") %></h2>
-<% I18n.t("planning.start_page.overview_body").each do |paragraph| %>
-  <p class="govuk-body"><%= paragraph %></p>
-<% end %>
-
-<h2 class="govuk-heading-l"><%= I18n.t("planning.start_page.before_you_start_title") %></h2>
-<p class="govuk-body"><%= I18n.t("planning.start_page.before_you_start_list_title") %></p>
-<ul class="govuk-list govuk-list--bullet"">
-  <% I18n.t("planning.start_page.before_you_start_list_items").each do |list_item| %>
-    <li><%= list_item %></li>
-  <% end %>
-</ul>
-<p class="govuk-body"><%= I18n.t("planning.start_page.before_you_start_body") %></p>
-<%= link_to I18n.t("generic.button.start"), new_journey_path, class: "govuk-button" %>
+<p class="govuk-body">How to procure a catering contract for your school.</p>
+
+<div class="govuk-accordion" data-module="govuk-accordion" id="accordion-default">
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Before you start
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-1" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">A catering contract typically takes between 3 to 6 months to complete.</p>
+
+      <p class="govuk-body">If you have an existing contract, you will need to find out the:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>end date</li>
+        <li>notice period</li>
+      </ul>
+
+      <p class="govuk-body">This will help you to plan when to start your procurement. It's best to start a new contract:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>at the beginning of the academic year</li>
+        <li>after long school holiday, for example, Christmas or Easter</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Ways to procure a catering contract
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-2" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">A catering contract is a high value procurement. We generally say high is over 40,000.</p>
+      <p class="govuk-body">You must run your own buying process, inviting suppliers to submit bids for the work.</p>
+      <p class="govuk-body">If you estimate that the contract is likely to be close to or over £189,330 you may have to <a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">run a compliant buying process</a> because it exceeds the procurement thresholds.</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Rules, regulations and requirements
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-3" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-1">
+      <p class="govuk-body">You'll need to be aware of some of the rules, regulations and requirements that can apply to a catering contract.</p>
+
+      <h3 class="govuk-heading-m">Standards for school food</h3>
+
+      <p class="govuk-body">Your school must comply with <a href="https://www.gov.uk/government/publications/standards-for-school-food-in-england" class="govuk-link">Standards for school food in England</a>.</p>
+
+      <h3 class="govuk-heading-m">Procurement threshold rules</h3>
+      <p class="govuk-body">If, over the lifetime of your contract, the value of your provision is over the <a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">procurement threshold</a>, you'll need to advertise a contract notice on the <a href="https://www.gov.uk/find-tender" class="govuk-link">Find a Tender</a> service.</p>
+
+      <h3 class="govuk-heading-m">TUPE and LGPS (Local Government Pension Scheme)</h3>
+
+      <p class="govuk-body">Consider whether <a href="https://www.gov.uk/guidance/staff-transfers-public-service-pension-schemes" class="govuk-link">TUPE</a> and LGPS will apply, especially if you're looking to outsource or come away from your local authority for the first time.</p>
+      <p class="govuk-body">When you give notice of termination to your current provider, you should also request details of any staff that will be subject to TUPE transfer.</p>
+      <p class="govuk-body">This anonymised information should include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>salary details</li>
+        <li>terms conditions</li>
+        <li>pension details</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Disclosure and Barring Service (DBS) checks</h3>
+      <p class="govuk-body">You'll need confirmation from suppliers that they've had the relevant DBS checks.</p>
+      <p class="govuk-body">It's your responsibility to check that everyone involved in the catering contract is DBS checked.</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          In-house catering
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-4" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">Running the service in-house is another option. You may want to consider whether this is right for your school before you procure a contract. There are benefits and challenges to running the service yourself.</p>
+      <h3 class="govuk-heading-m">Benefits</h3>
+      <p class="govuk-body">You might be able to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>increase uptake of school meals</li>
+        <li>negotiate better prices from suppliers</li>
+        <li>increase food quality</li>
+        <li>respond quicker if your equipment is broken or faulty</li>
+        <li>develop staff skills through bespoke training</li>
+        <li>generate income by offering your catering services to other schools or nurseries</li>
+        <li>be in control of your expenditure</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Staff training</h3>
+      <p class="govuk-body">Consider how you will provide initial training on:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>food specifications</li>
+        <li>menu building</li>
+        <li>health and safety</li>
+        <li>food hygiene</li>
+        <li>food preparation skills</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Costs and spending</h3>
+      <p class="govuk-body">You should fully understand your costings so you can:</p>
+      <ul class="govuk-list govuk-list--bullet">
+      <li>plan for increased spending, for example, staffing, equipment, food and utilities</li>
+      <li>plan for maintenance of equipment</li>
+      <li>avoid expensive budgeting errors</li>
+      <li>keep staff up to date with legislation and regulations by allowing time and money for on-going training</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Managing demand</h3>
+      <p class="govuk-body">You should:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>get regular feedback from parents, pupils and governors</li>
+        <li>check you have enough dining space to accommodate increased demand</li>
+      </ul>
+
+
+      <h3 class="govuk-heading-m">TUPE and LGPS</h3>
+      <p class="govuk-body">If you're moving away from a local authority, you'll need to obtain TUPE and LGPS information.</p>
+      <p class="govuk-body">There may be time frames around when the local authority is obliged to release this information.</p>
+      <p class="govuk-body">These time frames can cause delays and further expense if you award the contract without having the details.</p>
+
+      <h3 class="govuk-heading-m">Invite your local authority to tender</h3>
+      <p class="govuk-body">Invite your local authority to tender and involve them in the process. This way the TUPE and LGPS information must be provided during their bidding process.</p>
+
+      <h3 class="govuk-heading-m">Disclosure and Barring Service (DBS) checks</h3>
+      <p class="govuk-body">It's your responsibility to check that everyone involved in the catering contract is DBS checked.</p>
+
+      <h3 class="govuk-heading-m">Equipment and maintenance</h3>
+      <p class="govuk-body">Find out:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>what equipment the current provider may be repossess</li>
+        <li>which maintenance contracts your provider covers</li>
+        <li>whether maintenance checks are up to date</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Starting a procurement process
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-5" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <h3 class="govuk-heading-m">Who to involve</h3>
+
+      <p class="govuk-body">Make sure the headteacher and school governors have agreed to go ahead with procuring a new catering contract before you start.</p>
+      <p class="govuk-body">Throughout the process you should talk to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>school governors</li>
+        <li>senior leadership team</li>
+        <li>staff involved in school catering</li>
+      </ul>
+
+      <p class="govuk-body">Try to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>keep staff informed</li>
+        <li>address any concerns the staff may have</li>
+        <li>be aware that staff may wish to contact their union</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Talk to other schools</h3>
+      <p class="govuk-body">You may find it helpful to:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>ask other schools if they’re looking to renew their catering contract</li>
+        <li>negotiate bulk deals and discounts with suppliers</li>
+      </ul>
+      <p class="govuk-body">This may help you to get better value and spread the workload with other schools.</p>
+
+      <h3 class="govuk-heading-m">Get feedback about supplier</h3>
+      <p class="govuk-body">When selecting the suppliers, you may want to talk to other schools they serve and get feedback on the service they offer.</p>
+
+      <h3 class="govuk-heading-m">Supplier samples</h3>
+      <p class="govuk-body">You may want to ask potential suppliers to produce sample meals for you to try as this will form part of your specification and tender requirements</p>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          Writing your requirements
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-6" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">This is the document that you give to suppliers explaining what you want to buy, sometimes called a specification.</p>
+
+      <p class="govuk-body">It should tell potential suppliers what you need so that they can decide if they want to bid for the contract.</p>
+
+      <p class="govuk-body"><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/writing-a-specification" class="govuk-link">Read about how to write a specification</a></p>
+
+
+      <p class="govuk-body">Below are some of the things that you should include. You can also <%= link_to "use our tool to create a specification", root_path, class: "govuk-link" %>.</p>
+
+
+      <h3 class="govuk-heading-m">Objectives</h3>
+      <p class="govuk-body">Your objectives are important because it helps a supplier to decide whether they are a good fit for your school. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>your mission statement</li>
+        <li>goals your school has</li>
+        <li>policies that relate to catering</li>
+        <li>objectives that relates to social value</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Contract management</h3>
+      <p class="govuk-body">Set out how you expect the contract to be managed to ensure a good working relationship. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>your requirements on how the contract should be managed, such as any review meetings, how to monitor performance or costs, how complaints are managed and so on</li>
+        <li>what operational overheads the supplier will cover</li>
+        <li>any staff that the supplier will need to provide, and staff that need to be transferred</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Service parameters</h3>
+      <p class="govuk-body">Tell suppliers what service you want them to provide and who for. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>when you want the service to start</li>
+        <li>current services types, and times they are provided</li>
+        <li>customer numbers</li>
+        <li>free school meal numbers</li>
+        <li>the services you would like the supplier to provide</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Menu and ordering</h3>
+      <p class="govuk-body">Give suppliers some information about the food you would like them to serve and how it should be ordered and paid for. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>any requirements for the food served</li>
+        <li>ingredients or allergens to be avoided</li>
+        <li>ordering and payment systems you have, or would like to be provided</li>
+        <li>who is responsible for any dinner money debt</li>
+      </ul>
+
+      <h3 class="govuk-heading-m">Facilities</h3>
+      <p class="govuk-body">Outline the spaces and equipment that you have available for use. Include:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>the condition of any kitchens and if they are ready for service</li>
+        <li>equipment available to a supplier</li>
+        <li>a description of the dining areas</li>
+        <li>who sets up and clears away before and after service</li>
+        <li>cleaning responsibilities</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="govuk-accordion__section ">
+    <div class="govuk-accordion__section-header">
+      <h2 class="govuk-accordion__section-heading">
+        <span class="govuk-accordion__section-button" id="accordion-default-heading-1">
+          What to do next
+        </span>
+      </h2>
+    </div>
+    <div id="accordion-default-content-6" class="govuk-accordion__section-content" aria-labelledby="accordion-default-heading-4">
+      <p class="govuk-body">Once you have your specification, you will need to decide if you will be using the open or restricted procedure.</p>
+      <p class="govuk-body">You can then prepare your invitation to tender.</p>
+      <p class="govuk-body">Find out what the next steps are if you are:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-high-value-things-under-the-eu-procurement-threshold" class="govuk-link">under the procurement threshold</a></li>
+        <li><a href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/buying-things-that-are-over-the-eu-procurement-threshold" class="govuk-link">over the procurement threshold</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<h2 class="govuk-heading-m">Where to get help</h2>
+<p class="govuk-body">See where to <a href="https://www.gov.uk/guidance/buying-for-schools/get-help-with-buying-for-schools" class="govuk-link">get help with buying for schools</a> if you need it.</p>
diff --git a/app/views/pages/specifying_start_page.html.erb b/app/views/pages/specifying_start_page.html.erb
new file mode 100644
index 000000000..111897048
--- /dev/null
+++ b/app/views/pages/specifying_start_page.html.erb
@@ -0,0 +1,43 @@
+<%= content_for :title, I18n.t("specifying.start_page.page_title") %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("specifying.start_page.page_title") %></h1>
+
+<% I18n.t("specifying.start_page.overview_body").each do |paragraph| %>
+  <p class="govuk-body"><%= paragraph %></p>
+<% end %>
+
+<h2 class="govuk-heading-l"><%= I18n.t("specifying.start_page.who_for_title") %></h2>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_can_use_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.who_for_can_use_list").each do |list_item| %>
+    <li><%= list_item.html_safe %></li>
+  <% end %>
+</ul>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.who_for_cannot_use_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.who_for_cannot_use_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<h2 class="govuk-heading-l"><%= I18n.t("specifying.start_page.how_service_works_title") %></h2>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.how_service_works_document_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.how_service_works_document_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+<p class="govuk-body"><%= I18n.t("specifying.start_page.how_service_works_themes_body") %></p>
+<ul class="govuk-list govuk-list--bullet"">
+  <% I18n.t("specifying.start_page.how_service_works_themes_list").each do |list_item| %>
+    <li><%= list_item %></li>
+  <% end %>
+</ul>
+
+<p class="govuk-body"><%= I18n.t("specifying.start_page.pause_and_resume_body") %></p>
+
+<% if DfESignIn.bypass? %>
+  <%= button_to "#{I18n.t("generic.button.start")} (bypass DSI)", "/auth/developer", class: "govuk-button" %>
+<% else %>
+  <%= button_to I18n.t("generic.button.start"), "/auth/dfe", class: "govuk-button" %>
+<% end %>
diff --git a/app/views/sessions/failure.html.erb b/app/views/sessions/failure.html.erb
new file mode 100644
index 000000000..ad22371d2
--- /dev/null
+++ b/app/views/sessions/failure.html.erb
@@ -0,0 +1,6 @@
+<%= content_for :title, I18n.t("errors.sign_in.unexpected_failure.page_title") %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("errors.sign_in.unexpected_failure.page_title") %></h1>
+<p class="govuk-body">
+  <%= I18n.t("errors.sign_in.unexpected_failure.page_body") %>
+</p>
diff --git a/app/views/specifications/show.html.erb b/app/views/specifications/show.html.erb
new file mode 100644
index 000000000..ff9b21e21
--- /dev/null
+++ b/app/views/specifications/show.html.erb
@@ -0,0 +1,15 @@
+<%= content_for :title, @journey.category.capitalize %>
+<%= link_to I18n.t("generic.button.back"), journey_path(@journey), class: "govuk-back-link" %>
+
+<h1 class="govuk-heading-xl"><%= I18n.t("journey.specification.header") %></h1>
+<% unless @journey.all_steps_completed? %>
+  <div class="govuk-warning-text">
+    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+    <strong class="govuk-warning-text__text">
+      <span class="govuk-warning-text__assistive">Warning</span>
+      <%= I18n.t("journey.specification.warning") %>
+    </strong>
+  </div>
+<% end %>
+<%= link_to "Download (.docx)", journey_specification_path(@journey, format: :docx), class: "govuk-button" %>
+<%= @specification_html.html_safe %>
diff --git a/app/views/steps/_edit_form_wrapper.html.erb b/app/views/steps/_edit_form_wrapper.html.erb
index 72300574c..8e174312a 100644
--- a/app/views/steps/_edit_form_wrapper.html.erb
+++ b/app/views/steps/_edit_form_wrapper.html.erb
@@ -1,4 +1,4 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 <%= form_for @answer, as: :answer, method: "put", url: journey_step_answer_path(@journey, @step, @answer) do |f| %>
   <%= yield f %>
   <%= f.submit I18n.t("generic.button.update"), class: "govuk-button" %>
diff --git a/app/views/steps/_new_form_wrapper.html.erb b/app/views/steps/_new_form_wrapper.html.erb
index f72359486..fc0bbb909 100644
--- a/app/views/steps/_new_form_wrapper.html.erb
+++ b/app/views/steps/_new_form_wrapper.html.erb
@@ -1,5 +1,5 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 <%= form_for @answer, as: :answer, url: journey_step_answers_path(@journey, @step), method: "post" do |f| %>
   <%= yield f %>
-  <%= f.submit @step.primary_call_to_action_text, class: "govuk-button" %>
+  <%= f.submit @step_presenter.primary_call_to_action_text, class: "govuk-button" %>
 <% end %>
diff --git a/app/views/steps/checkboxes.html.erb b/app/views/steps/checkboxes.html.erb
index 60bb18963..be589abb2 100644
--- a/app/views/steps/checkboxes.html.erb
+++ b/app/views/steps/checkboxes.html.erb
@@ -1,8 +1,39 @@
 <%= render layout: layout do |f| %>
-  <%= f.govuk_collection_check_boxes :response,
-    checkbox_options(array_of_options: @step.options_list),
-    :id,
-    :name,
-    legend: { text: @step.title, size: "l" }
-  %>
+  <%= f.govuk_check_boxes_fieldset :response, legend: { text: @step_presenter.title, size: "l" } do %>
+    <% if @step.help_text.present? %>
+      <span class="govuk-hint">
+        <%= @step_presenter.help_text_html %>
+      </span>
+    <% end %>
+
+    <% @step.options.each do |option| %>
+      <% machine_value = machine_readable_option(string: option["value"]) %>
+      <% if option.fetch("separated_by_or", nil) == true %>
+        <div class="govuk-radios__divider">or</div>
+      <% end %>
+
+      <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
+
+      <% if option["display_further_information"] == true || option["display_further_information"] == "single" %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } do %>
+          <%= f.govuk_text_field "#{machine_value}_further_information",
+            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+        <% end %>
+      <% elsif option["display_further_information"] == "long" %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } do %>
+          <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6,
+            label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+        <% end %>
+      <% else %>
+        <%= f.govuk_check_box :response, option["value"], label: { text: option["value"] } %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <% if @step_presenter.skippable? %>
+    <div class="govuk-radios__divider">or</div>
+    <div class="govuk-form-group">
+      <%= f.button @step_presenter.skip_call_to_action_text, type: "submit", name: "skip", value: "true", class: "govuk-button govuk-button--secondary" %>
+    </div>
+  <% end %>
 <% end %>
diff --git a/app/views/steps/currency.html.erb b/app/views/steps/currency.html.erb
new file mode 100644
index 000000000..95ba6567c
--- /dev/null
+++ b/app/views/steps/currency.html.erb
@@ -0,0 +1,7 @@
+<%= render layout: layout do |f| %>
+  <%= f.govuk_text_field :response,
+    label: { text: @step_presenter.title, size: "l" },
+    prefix_text: "£",
+    hint: -> { @step_presenter.help_text_html }
+  %>
+<% end %>
diff --git a/app/views/steps/long_text.html.erb b/app/views/steps/long_text.html.erb
index 4f4984116..8cd8d3079 100644
--- a/app/views/steps/long_text.html.erb
+++ b/app/views/steps/long_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_area :response,
-    label: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text },
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html },
     width: "one-third",
     rows: 9
   %>
diff --git a/app/views/steps/number.html.erb b/app/views/steps/number.html.erb
new file mode 100644
index 000000000..3848947d0
--- /dev/null
+++ b/app/views/steps/number.html.erb
@@ -0,0 +1,6 @@
+<%= render layout: layout do |f| %>
+  <%= f.govuk_text_field :response,
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html }
+  %>
+<% end %>
diff --git a/app/views/steps/paragraphs.html.erb b/app/views/steps/paragraphs.html.erb
index 39f541597..ecc83ddbf 100644
--- a/app/views/steps/paragraphs.html.erb
+++ b/app/views/steps/paragraphs.html.erb
@@ -1,7 +1,7 @@
-<%= content_for :title, @step.title %>
+<%= content_for :title, @step_presenter.title %>
 
-<h1 class="govuk-heading-xl"><%= @step.title %></h1>
+<h1 class="govuk-heading-xl"><%= @step_presenter.title %></h1>
 <div class="static-content">
-  <%= simple_format(@step.body, wrapper_tag: "p", class: "govuk-body") %>
+  <%= simple_format(@step_presenter.body, wrapper_tag: "p", class: "govuk-body") %>
 </div>
-<%= link_to @step.primary_call_to_action_text, journey_path(@journey), class: "govuk-button" %>
+<%= link_to @step_presenter.primary_call_to_action_text, journey_path(@journey), class: "govuk-button" %>
diff --git a/app/views/steps/radios.html.erb b/app/views/steps/radios.html.erb
index b3ce99def..61865e7c6 100644
--- a/app/views/steps/radios.html.erb
+++ b/app/views/steps/radios.html.erb
@@ -1,19 +1,31 @@
 <%= render layout: layout do |f| %>
   <%= f.hidden_field :response, value: nil %>
-  <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step.title }) do %>
+  <%= f.govuk_radio_buttons_fieldset(:response, legend: { size: "l", text: @step_presenter.title }) do %>
     <% if @step.help_text.present? %>
-      <span class="govuk-hint">
-        <%= @step.help_text %>
-      </span>
+      <div class="govuk-hint">
+        <%= @step_presenter.help_text_html %>
+      </div>
     <% end %>
 
     <% @step.options.each do |option| %>
-      <% if option["display_further_information"] == true %>
-        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
-          <%= f.govuk_text_area :further_information, rows: 1, label: { text: option["further_information_help_text"] } %>
+      <% machine_value = machine_readable_option(string: option["value"]) %>
+
+      <% f.object = monkey_patch_form_object_with_further_information_field(form_object: f.object, associated_choice: machine_value) %>
+
+      <% if option.fetch("separated_by_or", nil) == true %>
+        <div class="govuk-radios__divider">or</div>
+      <% end %>
+      <% if option["display_further_information"] %>
+        <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } do %>
+          <% if option["display_further_information"] == "single" || option["display_further_information"] == true %>
+            <%= f.govuk_text_field "#{machine_value}_further_information", label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+          <% elsif option["display_further_information"] == "long" %>
+            <%= f.govuk_text_area "#{machine_value}_further_information", rows: 6, label: { text: option.fetch("further_information_help_text", "Optional further information"), hidden: !option.keys.include?("further_information_help_text") } %>
+          <% end %>
         <% end %>
       <% else %>
-        <%= f.govuk_radio_button :response, option["value"].downcase, label: { text: option["value"] }, hint: { text: option["help_text"] } %>
+        <!-- We have to include this if there is no block given, selecting an option causes a page jump as a conditional element is toggled by the form builder -->
+        <%= f.govuk_radio_button :response, option["value"], label: { text: option["value"] }, hint: { text: option["help_text"] } %>
       <% end %>
     <% end %>
   <% end %>
diff --git a/app/views/steps/short_text.html.erb b/app/views/steps/short_text.html.erb
index 172c6649d..04a495804 100644
--- a/app/views/steps/short_text.html.erb
+++ b/app/views/steps/short_text.html.erb
@@ -1,7 +1,7 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_text_field :response,
-    label: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text },
+    label: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html },
     width: "one-third"
   %>
 <% end %>
diff --git a/app/views/steps/single_date.html.erb b/app/views/steps/single_date.html.erb
index b09581207..cf8b660fa 100644
--- a/app/views/steps/single_date.html.erb
+++ b/app/views/steps/single_date.html.erb
@@ -1,6 +1,6 @@
 <%= render layout: layout do |f| %>
   <%= f.govuk_date_field :response,
-    legend: { text: @step.title, size: "l" },
-    hint: { text: @step.help_text }
+    legend: { text: @step_presenter.title, size: "l" },
+    hint: -> { @step_presenter.help_text_html }
   %>
 <% end %>
diff --git a/config/application.rb b/config/application.rb
index 0b9010946..c9011c268 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,6 +8,8 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+require "./lib/dfe_sign_in"
+
 module BuyForYourSchool
   class Application < Rails::Application
     config.generators do |g|
@@ -40,5 +42,9 @@ class Application < Rails::Application
     end
 
     config.active_job.queue_adapter = :sidekiq
+
+    config.i18n.load_path += Dir[Rails.root.join("config", "locales", "**", "*.{rb,yml}")]
+    config.i18n.default_locale = :en
+    config.i18n.enforce_available_locales = false
   end
 end
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
new file mode 100644
index 000000000..5e915be4d
--- /dev/null
+++ b/config/brakeman.ignore
@@ -0,0 +1,57 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Redirect",
+      "warning_code": 18,
+      "fingerprint": "11f128de39b52c4f17c8ac43be1a514cd57e37b172f37589d54738782abb2665",
+      "check_name": "Redirect",
+      "message": "Possible unprotected redirect",
+      "file": "app/controllers/sessions_controller.rb",
+      "line": 30,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
+      "code": "redirect_to(UserSession.new(:session => (session)).sign_out_url)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "SessionsController",
+        "method": "destroy"
+      },
+      "user_input": "UserSession.new(:session => (session)).sign_out_url",
+      "confidence": "High",
+      "note": ""
+    },
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "3863b51add0146069c24410ec1bfc99015d680679d275ce49f27cc22b6dc8f9e",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped model attribute",
+      "file": "app/views/specifications/show.html.erb",
+      "line": 15,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "SpecificationRenderer.new(:template => Journey.find(journey_id).liquid_template, :answers => GetAnswersForSteps.new(:visible_steps => Journey.find(journey_id).visible_steps.includes([:radio_answer, :short_text_answer, :long_text_answer, :single_date_answer, :checkbox_answers, :number_answer, :currency_answer])).call).to_html",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "SpecificationsController",
+          "method": "show",
+          "line": 25,
+          "file": "app/controllers/specifications_controller.rb",
+          "rendered": {
+            "name": "specifications/show",
+            "file": "app/views/specifications/show.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "specifications/show"
+      },
+      "user_input": "Journey.find(journey_id).liquid_template",
+      "confidence": "Weak",
+      "note": ""
+    }
+  ],
+  "updated": "2021-03-22 16:32:31 +0000",
+  "brakeman_version": "5.0.0"
+}
diff --git a/config/environments/production.rb b/config/environments/production.rb
index d2b469d9b..4713d7a99 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Load environment variables that are created by GPaaS
+require_relative "../../lib/vcap_parser"
+VcapParser.load_service_environment_variables!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 87d513e60..1349c2e8a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -64,5 +64,7 @@
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :long_text_answer
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :single_date_answer
     Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :checkbox_answers
+    Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :number_answer
+    Bullet.add_whitelist type: :unused_eager_loading, class_name: "Step", association: :currency_answer
   end
 end
diff --git a/config/initializers/dotenv.rb b/config/initializers/_dotenv.rb
similarity index 82%
rename from config/initializers/dotenv.rb
rename to config/initializers/_dotenv.rb
index 3986747f7..aca34a326 100644
--- a/config/initializers/dotenv.rb
+++ b/config/initializers/_dotenv.rb
@@ -2,11 +2,12 @@
 # https://github.com/bkeepers/dotenv#required-keys
 if defined?(Dotenv)
   Dotenv.require_keys(
+    "APPLICATION_URL",
     "CONTENTFUL_URL",
     "CONTENTFUL_SPACE",
     "CONTENTFUL_ENVIRONMENT",
     "CONTENTFUL_ACCESS_TOKEN",
-    "CONTENTFUL_PLANNING_START_ENTRY_ID",
+    "CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID",
     "CONTENTFUL_PREVIEW_APP",
     "CONTENTFUL_ENTRY_CACHING"
   )
diff --git a/config/initializers/default_url_options.rb b/config/initializers/default_url_options.rb
new file mode 100644
index 000000000..7c05ebeae
--- /dev/null
+++ b/config/initializers/default_url_options.rb
@@ -0,0 +1,7 @@
+if ENV["APPLICATION_URL"]
+  uri = URI(ENV["APPLICATION_URL"])
+
+  Rails.application.routes.default_url_options[:host] = uri.host
+  Rails.application.routes.default_url_options[:port] = uri.port
+  Rails.application.routes.default_url_options[:protocol] = uri.scheme
+end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 000000000..aadd4aacd
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,35 @@
+OmniAuth.config.logger = Rails.logger
+
+dfe_sign_in_issuer_uri = URI(ENV.fetch("DFE_SIGN_IN_ISSUER", "example"))
+dfe_sign_in_identifier = ENV.fetch("DFE_SIGN_IN_IDENTIFIER", "example")
+dfe_sign_in_secret = ENV.fetch("DFE_SIGN_IN_SECRET", "example")
+dfe_sign_in_redirect_uri = ENV.fetch("DFE_SIGN_IN_REDIRECT_URL", "example")
+
+dfe_sign_in_issuer_url = "#{dfe_sign_in_issuer_uri}:#{dfe_sign_in_issuer_uri.port}" if dfe_sign_in_issuer_uri.port
+
+options = {
+  name: :dfe,
+  discovery: true,
+  response_type: :code,
+  issuer: dfe_sign_in_issuer_url,
+  scope: %i[openid],
+  client_auth_method: :client_secret_post,
+  client_options: {
+    port: dfe_sign_in_issuer_uri.port,
+    scheme: dfe_sign_in_issuer_uri.scheme,
+    host: dfe_sign_in_issuer_uri.host,
+    identifier: dfe_sign_in_identifier,
+    secret: dfe_sign_in_secret,
+    redirect_uri: dfe_sign_in_redirect_uri
+  }
+}
+
+if DfESignIn.bypass?
+  Rails.application.config.middleware.use OmniAuth::Builder do
+    provider :developer,
+      fields: %i[uid],
+      uid_field: :uid
+  end
+else
+  Rails.application.config.middleware.use OmniAuth::Strategies::OpenIDConnect, options
+end
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index 593ba4db3..c97ceae99 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -6,7 +6,7 @@ def redis
       else
         Redis::Namespace.new(
           "buy_for_your_school",
-          redis: Redis.new(url: ENV["REDIS_CACHE_URL"])
+          redis: Redis.new(url: ENV["REDIS_URL"], db: 1)
         )
       end
     end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index e80787b84..b4b90970f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,5 +1,5 @@
 Sidekiq.configure_server do |config|
-  config.redis = {url: ENV["REDIS_SIDEKIQ_URL"]}
+  config.redis = {url: "#{ENV["REDIS_URL"]}/2"}
 
   # Sidekiq Cron
   schedule_file = "config/schedule.yml"
@@ -9,5 +9,5 @@
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = {url: ENV["REDIS_SIDEKIQ_URL"]}
+  config.redis = {url: "#{ENV["REDIS_URL"]}/2"}
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 600ad125b..48f6a8fcb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,7 +6,9 @@ en:
       default: "%-d %b %Y"
   generic:
     button:
-      start: "Continue"
+      back: "Back"
+      start: "Start"
+      sign_out: "Sign out"
       next: "Continue"
       change_answer: "Change"
       update: "Update"
@@ -19,32 +21,75 @@ en:
       message: "This environment is only for previewing Contentful changes before publishing."
   planning:
     start_page:
-      page_title: "Identify the level of support you need for what you're buying"
-      overview_title: "Overview"
+      page_title: "Catering services"
+  specifying:
+    start_page:
+      page_title: Create a specification to procure a catering service for your school
       overview_body:
-        - "Get the right level of support you need to buy goods and services for your school."
-        - "By telling us about your experience and confidence levels in buying the goods or service, we will tailor the guidance that will be shown to you on screen."
-        - "More guidance will be shown if you need more support. For experienced buyers, the guidance will be hidden, but will be accessible to you within each page if you need it."
-      before_you_start_title: "Before you start"
-      before_you_start_list_title: "Consider:"
-      before_you_start_list_items:
-        - any previous experience in buying the goods or services you need
-        - your level of understanding of the procurement process
-        - your school's procurement policy
-        - support you have access to in your school
-        - information on the current contract
-      before_you_start_body: "It will take around 3 minutes to complete the process"
+        - Use this service to create a specification for a new catering service for a single school in England.
+      who_for_title: Who this service is for
+      who_for_can_use_body: "You can use this service if you:"
+      who_for_can_use_list:
+        - are responsible for <a href="/planning" class="govuk-link">procuring a new catering service for a school</a>
+        - are procuring for one school – either a local authority maintained school or an academy in a single or multi-academy trust
+        - intend to run your own procurement process or choose a supplier from a framework – read more about the different procurement routes you can take
+      who_for_cannot_use_body: "You currently cannot use this service to create a specification for any of the following:"
+      who_for_cannot_use_list:
+        - any other service outside of catering
+        - goods, supplies or equipment only
+        - multiple schools at the same time
+      how_service_works_title: How this service works
+      how_service_works_document_body: "Use this service to create a document that:"
+      how_service_works_document_list:
+        - describes the service your school is looking for
+        - collates all the information that any suppliers interested in your contract need to know
+        - includes all the standard regulations and requirements that school catering suppliers must comply with – we’ll add these automatically for you, you do not need to know what these are
+      how_service_works_themes_body: "We’ll guide you through a series of questions about your school and your requirements, including specific questions around the following themes:"
+      how_service_works_themes_list:
+        - any mission statement, food policy or goals your school has that are relevant to the new service
+        - any objectives you may have relating to social value
+        - any requirements you may have relating to management of the contract, operational overheads and staff
+        - the dates, types, times and customer numbers of existing catering services
+        - any requirements for the food served, as well as ordering and payment systems
+        - the catering spaces and equipment available to a supplier in your school
+      pause_and_resume_body: You can pause and resume your specification at any time.
     errors:
       contentful_entry_not_found: "An unexpected error occurred. The starting step has been revoked by the content team."
   journey:
+    index:
+      existing:
+        header: "Existing specifications"
     specification:
       header: "Your specification"
+      warning: "You have not completed all the tasks. There may be information missing from your specification."
+      button: "View your specification"
+      download:
+        warning:
+          incomplete: "<article id='warning'><p></b>You have not completed all the tasks in Create a specification. There may be information missing from your specification.</b></p></article>"
+  specification:
+  dashboard:
+    header: "Specifications dashboard"
+    create:
+      header: "Create a new specification"
+      body: "Create a new specification for a catering procurement."
+      link: "Create a new specification"
+    existing:
+      header: "Existing specifications"
+      body: "Continue with a draft specification, and review completed specifications."
+      link: "Existing specifications"
   task_list:
     status:
       not_started: Not started
       completed: Completed
   journey_map:
     page_title: "Contentful entry map"
+    edit_step_link_text: "Edit step in Contentful"
+    preview_step_link_text: "Preview step in service"
+    spec_template_tag_title: "Specification tag"
+  resume:
+    notification:
+      title: "Returning to this specification"
+      body: "You can return to this page to make changes or view your specification at any time, either by bookmarking this page in your browser or by making a note of the following address:"
   errors:
     contentful_entry_not_found:
       page_title: "An unexpected error occurred"
@@ -58,9 +103,10 @@ en:
     repeat_step_in_the_contentful_journey:
       page_title: "An unexpected error occurred"
       page_body: "One or more steps in the Contentful journey would leave the user in an infinite loop. This entry ID was presented more than once to the user: %{entry_id}"
-    too_many_steps_in_the_contentful_journey:
-      page_title: "An unexpected error occurred"
-      page_body: "More than %{step_count} steps were found in the Contentful journey. Is the journey missing an end? The last Entry ID was: %{entry_id}"
     specification_template_invalid:
       page_title: "An unexpected error occurred"
       page_body: "The service has had a problem trying to retrieve a working Specification template. The team have been notified of this problem and you should be able to retry shortly."
+    sign_in:
+      unexpected_failure:
+        page_title: "An unexpected error occurred"
+        page_body: "The service was unable to successfully authenticate you. The team have been notified of this problem and you should be able to retry shortly."
diff --git a/config/locales/models/single_date_answer.en.yml b/config/locales/models/single_date_answer.en.yml
new file mode 100644
index 000000000..05deddf52
--- /dev/null
+++ b/config/locales/models/single_date_answer.en.yml
@@ -0,0 +1,8 @@
+---
+en:
+  activerecord:
+    errors:
+      models:
+        single_date_answer:
+          attributes:
+            response: Provide a real date for this answer
diff --git a/config/routes.rb b/config/routes.rb
index af256d000..5e0b32555 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,10 +2,20 @@
 
 Rails.application.routes.draw do
   get "health_check" => "application#health_check"
-  root to: "high_voltage/pages#show", id: "planning_start_page"
+  root to: "pages#show", id: "specifying_start_page"
+
+  get "planning" => "pages#show", "id" => "planning_start_page"
+  post "/api/contentful/entry_updated" => "api/contentful/entries#changed"
+
+  # DfE Sign In
+  get "/auth/dfe/callback", to: "sessions#create"
+  get "/auth/dfe/signout", to: "sessions#destroy"
+  get "/auth/failure", to: "sessions#failure"
+  post "/auth/developer/callback" => "sessions#bypass_callback" if Rails.env.development?
 
   resource :journey_map, only: [:new]
-  resources :journeys, only: [:new, :show] do
+  resources :journeys, only: [:index, :new, :show] do
+    resource :specification, only: [:show]
     resources :steps, only: [:new, :show, :edit] do
       resources :answers, only: [:create, :update]
     end
@@ -14,4 +24,6 @@
   namespace :preview do
     resources :entries, only: [:show]
   end
+
+  get "dashboard", to: "dashboard#show"
 end
diff --git a/db/migrate/20210125171840_remove_next_entry_id.rb b/db/migrate/20210125171840_remove_next_entry_id.rb
new file mode 100644
index 000000000..f0883ad67
--- /dev/null
+++ b/db/migrate/20210125171840_remove_next_entry_id.rb
@@ -0,0 +1,5 @@
+class RemoveNextEntryId < ActiveRecord::Migration[6.1]
+  def change
+    remove_column(:journeys, :next_entry_id)
+  end
+end
diff --git a/db/migrate/20210127154732_create_number_answer.rb b/db/migrate/20210127154732_create_number_answer.rb
new file mode 100644
index 000000000..acf25acdb
--- /dev/null
+++ b/db/migrate/20210127154732_create_number_answer.rb
@@ -0,0 +1,13 @@
+class CreateNumberAnswer < ActiveRecord::Migration[6.1]
+  def up
+    create_table :number_answers, id: :uuid do |t|
+      t.references :step, type: :uuid
+      t.integer :response, null: false
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :number_answers
+  end
+end
diff --git a/db/migrate/20210202120716_create_currency_answer.rb b/db/migrate/20210202120716_create_currency_answer.rb
new file mode 100644
index 000000000..83b2b6071
--- /dev/null
+++ b/db/migrate/20210202120716_create_currency_answer.rb
@@ -0,0 +1,13 @@
+class CreateCurrencyAnswer < ActiveRecord::Migration[6.1]
+  def up
+    create_table :currency_answers, id: :uuid do |t|
+      t.references :step, type: :uuid
+      t.decimal :response, null: false, precision: 11, scale: 2
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :currency_answers
+  end
+end
diff --git a/db/migrate/20210202170113_add_section_order_to_journey.rb b/db/migrate/20210202170113_add_section_order_to_journey.rb
new file mode 100644
index 000000000..02f2e90e7
--- /dev/null
+++ b/db/migrate/20210202170113_add_section_order_to_journey.rb
@@ -0,0 +1,5 @@
+class AddSectionOrderToJourney < ActiveRecord::Migration[6.1]
+  def change
+    add_column :journeys, :section_groups, :jsonb
+  end
+end
diff --git a/db/migrate/20210209111509_add_hidden_state_to_step.rb b/db/migrate/20210209111509_add_hidden_state_to_step.rb
new file mode 100644
index 000000000..b98ee4aa3
--- /dev/null
+++ b/db/migrate/20210209111509_add_hidden_state_to_step.rb
@@ -0,0 +1,5 @@
+class AddHiddenStateToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :hidden, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20210211104039_add_additional_step_rule_to_step.rb b/db/migrate/20210211104039_add_additional_step_rule_to_step.rb
new file mode 100644
index 000000000..6179cddb7
--- /dev/null
+++ b/db/migrate/20210211104039_add_additional_step_rule_to_step.rb
@@ -0,0 +1,5 @@
+class AddAdditionalStepRuleToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :additional_step_rule, :jsonb
+  end
+end
diff --git a/db/migrate/20210217145518_add_further_information_to_checkboxes.rb b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
new file mode 100644
index 000000000..f10ff1332
--- /dev/null
+++ b/db/migrate/20210217145518_add_further_information_to_checkboxes.rb
@@ -0,0 +1,5 @@
+class AddFurtherInformationToCheckboxes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :checkbox_answers, :further_information, :jsonb
+  end
+end
diff --git a/db/migrate/20210223102716_change_additional_step_rule_name.rb b/db/migrate/20210223102716_change_additional_step_rule_name.rb
new file mode 100644
index 000000000..6aae0970b
--- /dev/null
+++ b/db/migrate/20210223102716_change_additional_step_rule_name.rb
@@ -0,0 +1,5 @@
+class ChangeAdditionalStepRuleName < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :steps, :additional_step_rule, :additional_step_rules
+  end
+end
diff --git a/db/migrate/20210301151653_add_skippable_to_step.rb b/db/migrate/20210301151653_add_skippable_to_step.rb
new file mode 100644
index 000000000..e74a1fa3b
--- /dev/null
+++ b/db/migrate/20210301151653_add_skippable_to_step.rb
@@ -0,0 +1,5 @@
+class AddSkippableToStep < ActiveRecord::Migration[6.1]
+  def change
+    add_column :steps, :skip_call_to_action_text, :string, default: nil
+  end
+end
diff --git a/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb b/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb
new file mode 100644
index 000000000..3b5c13256
--- /dev/null
+++ b/db/migrate/20210302110746_add_skipped_to_checkbox_answers.rb
@@ -0,0 +1,5 @@
+class AddSkippedToCheckboxAnswers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :checkbox_answers, :skipped, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb b/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb
new file mode 100644
index 000000000..b46dd8d32
--- /dev/null
+++ b/db/migrate/20210316114040_change_further_information_to_json_for_radio_answers.rb
@@ -0,0 +1,27 @@
+class ChangeFurtherInformationToJsonForRadioAnswers < ActiveRecord::Migration[6.1]
+  def up
+    add_column :radio_answers, :further_information_jsonb, :jsonb
+    ActiveRecord::Base.transaction do
+      RadioAnswer.all.map do |radio|
+        machine_value = radio.response.parameterize(separator: "_")
+        hash = {machine_value => radio.further_information}
+        radio.update(further_information_jsonb: hash)
+      end
+    end
+    remove_column :radio_answers, :further_information
+    rename_column :radio_answers, :further_information_jsonb, :further_information
+  end
+
+  def down
+    add_column :radio_answers, :further_information_string, :string
+    ActiveRecord::Base.transaction do
+      RadioAnswer.all.map do |radio|
+        machine_value = radio.response.parameterize(separator: "_")
+        matching_further_information = radio.further_information[machine_value]
+        radio.update(further_information_string: matching_further_information)
+      end
+    end
+    remove_column :radio_answers, :further_information
+    rename_column :radio_answers, :further_information_string, :further_information
+  end
+end
diff --git a/db/migrate/20210318105104_create_user_table.rb b/db/migrate/20210318105104_create_user_table.rb
new file mode 100644
index 000000000..3b7b61608
--- /dev/null
+++ b/db/migrate/20210318105104_create_user_table.rb
@@ -0,0 +1,8 @@
+class CreateUserTable < ActiveRecord::Migration[6.1]
+  def change
+    create_table :users, id: :uuid do |t|
+      t.string :dfe_sign_in_uid, null: false
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20210325145645_set_up_user_journey_association.rb b/db/migrate/20210325145645_set_up_user_journey_association.rb
new file mode 100644
index 000000000..bc307a406
--- /dev/null
+++ b/db/migrate/20210325145645_set_up_user_journey_association.rb
@@ -0,0 +1,7 @@
+class SetUpUserJourneyAssociation < ActiveRecord::Migration[6.1]
+  def change
+    change_table :journeys do |t|
+      t.belongs_to :user, type: :uuid
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 17fe498e7..71b77fe97 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_01_18_123111) do
+ActiveRecord::Schema.define(version: 2021_03_25_145645) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -22,15 +22,27 @@
     t.string "response", default: [], array: true
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.jsonb "further_information"
+    t.boolean "skipped", default: false
     t.index ["step_id"], name: "index_checkbox_answers_on_step_id"
   end
 
+  create_table "currency_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "step_id"
+    t.decimal "response", precision: 11, scale: 2, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["step_id"], name: "index_currency_answers_on_step_id"
+  end
+
   create_table "journeys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "category", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.string "next_entry_id"
-    t.jsonb "liquid_template"
+    t.jsonb "liquid_template", null: false
+    t.jsonb "section_groups"
+    t.uuid "user_id"
+    t.index ["user_id"], name: "index_journeys_on_user_id"
   end
 
   create_table "long_text_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -41,12 +53,20 @@
     t.index ["step_id"], name: "index_long_text_answers_on_step_id"
   end
 
+  create_table "number_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "step_id"
+    t.integer "response", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["step_id"], name: "index_number_answers_on_step_id"
+  end
+
   create_table "radio_answers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "step_id"
     t.string "response", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.text "further_information"
+    t.jsonb "further_information"
     t.index ["step_id"], name: "index_radio_answers_on_step_id"
   end
 
@@ -79,9 +99,18 @@
     t.string "contentful_id", null: false
     t.jsonb "raw", null: false
     t.jsonb "options"
+    t.boolean "hidden", default: false
+    t.jsonb "additional_step_rules"
+    t.string "skip_call_to_action_text"
     t.index ["journey_id"], name: "index_steps_on_journey_id"
   end
 
+  create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "dfe_sign_in_uid", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   add_foreign_key "long_text_answers", "steps", on_delete: :cascade
   add_foreign_key "radio_answers", "steps", on_delete: :cascade
   add_foreign_key "short_text_answers", "steps", on_delete: :cascade
diff --git a/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md b/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md
new file mode 100644
index 000000000..9eaf1ae1e
--- /dev/null
+++ b/doc/architecture/decisions/0009-create-infrastructure-on-gpaas-cloud-foundry-with-terraform.md
@@ -0,0 +1,26 @@
+# 9. Create infrastructure on GPaas Cloud Foundry with Terraform
+
+Date: 2021-03-09
+
+## Status
+
+Accepted
+
+## Context
+
+The early beta was originally hosted on dxw's Heroku to get delivering quickly whilst access to GPaaS could be set up.
+
+Access to GPaaS with approved billing has now been confirmed so we are migrating the service to its longer term home.
+
+## Decision
+
+- Move the service from Heroku to GPaaS for all environments except the ephemeral pull request review environments.
+- Use Terraform to define the infrastructure as code.
+
+
+## Consequences
+
+- the service will be easier to maintain in the long term if it is grouped with the rest of DfE's digital services inside GPaaS
+- the service will need to be Terraformed as other DfE digital services
+- as there are no real users of the service there is less risk to migrating the service now rather than later
+- the pull request environments will no longer have strong parity with the live service on an infrastructure level. This can be changed in future if we have move time to also the approach taken by Teaching Vacancies
diff --git a/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md b/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md
new file mode 100644
index 000000000..63a93ca94
--- /dev/null
+++ b/doc/architecture/decisions/0010-use-dfe-sign-in-as-auth-provider.md
@@ -0,0 +1,30 @@
+# 10. use-dfe-sign-in-as-auth-provider
+
+Date: 2021-03-22
+
+## Status
+
+Accepted
+
+## Context
+
+The service needs a way to authenticate trusted school buying professionals and to restrict the majority of access to the public.
+
+We believe a simpler password-less authentication mechanism would be all that's required. This service does not need any of the school and user information held within DfE Sign-in (DSI). DfE governance has reviewed our concern and decided this service should use DSI.
+
+There is currently no formal recommendation for a tool of choice in the technical guidance https://github.com/DFE-Digital/technical-guidance.
+
+We want a tool that provides an open and modern security standard.
+
+## Decision
+
+We are going to use DSI as our single sign-on provider using the OIDC standard.
+
+## Consequences
+
+- we think that the additional steps needed for the sign in journey will negatively affect the user experience and the ability for users to succeed first time
+- we think it will be difficult to clearly steer users who don't have a DSI account to create one first before continuing back (this will be a dead end for our service until they talk to their school approver)
+- the DSI has been in service for a couple of years now. We expect that most of our users will already have accounts on sign-in
+- DSI is being used actively by other DfE Digital services such as Claim, Apply and Teaching Vacancies. It is a core part of the DfE's service wide design and infrastructure that should be actively supported
+- in future the service may need more information that DSI can make available such as school information, using DSI already would make this easier to obtain
+- there may be advantages to the user experience for school users who use other DfE digital services. Using DSI would present a single view that may increase trust and allow them to jump between services without repeat sign ins
diff --git a/doc/dfe-sign-in.md b/doc/dfe-sign-in.md
new file mode 100644
index 000000000..020e2dfae
--- /dev/null
+++ b/doc/dfe-sign-in.md
@@ -0,0 +1,25 @@
+# DfE Sign-in
+
+We are using DfE Sign-in as the Single Sign-on provider for this service.
+
+## Onboarding
+
+For development, with `DFE_SIGN_IN_ENABLED` set to false you do not need the following in order to start the app. You can provide _any_ value in the `UID` field to sign in.
+
+If you'd like to sign in on a live environment:
+
+1. DfE need to invite your DfE email address to the [necessary environments](#environments) that you can sign in as a regular user. We asked in [the DfE #digital-tools-support Slack channel](https://ukgovernmentdfe.slack.com/archives/CMS9V0JQL)
+2. Another DfE user that is an approver for at least one school needs to invite you. This could an existing dev on the team. [We have been using this school for staging access](https://test-services.signin.education.gov.uk/approvals/50F4A834-9314-4A66-969E-C86D03821C26/users)
+3. You should now be able to sign into the service's staging environment from this application's sign in journey
+
+## Environments
+
+This service has numerous environments and each needs to be paired and configured with a unique DfE environment.
+
+|                | Enabled      | DfE Sign-in Env                                                       | DfE manage service |
+| :------------- | :----------: | :-------------------------------------------------------------------: | :----------------: |
+|  Development   |  false       |                                                                       |                    |
+|  Staging       |  true        | [test-integration](https://test-interactions.signin.education.gov.uk) | [manage](https://test-manage.signin.education.gov.uk/services/FD39DCFC-9B60-46C4-ACDC-699A2468B46F/service-configuration)
+|  Research      |  false       |                                                                       |                    |
+|  Preview       |  false       |                                                                       |                    |
+|  Production    |  false       |                                                                       |                    |
diff --git a/doc/getting-started.md b/doc/getting-started.md
new file mode 100644
index 000000000..239cde62c
--- /dev/null
+++ b/doc/getting-started.md
@@ -0,0 +1,58 @@
+# Getting started
+
+1. [Install Docker for Mac](https://docs.docker.com/docker-for-mac/install/)
+1. copy `/.env.example` into `/.env.development.local`.
+
+  Our intention is that the example should include enough to get the application started quickly. If this is not the case, please ask another developer for a copy of their `/.env.development.local` file.
+
+1. `script/server`
+1. Visit http://localhost:3000
+
+## Running the tests
+
+### The whole test suite
+
+* Using Docker has high parity, you don't have to install any dependencies but it takes longer to run (~20 seconds):
+
+    ```bash
+    docker-compose -f docker-compose.test.yml run --rm test bundle exec rake
+    ```
+* Without Docker is faster (~5 seconds) but has lower parity and you will need to install local dependencies on your machine first:
+
+    ```bash
+    brew install postgres
+    brew services start postgres
+    brew install redis
+    brew services start redis
+    createuser postgres --super
+    rbenv install 2.6.6 && rbenv local 2.6.6
+    gem install bundle && bundle
+    RAILS_ENV=test rake db:setup
+    ```
+    ```ruby
+    script/test
+    ```
+
+### RSpec only
+
+```
+bundle exec rspec spec/*
+```
+
+## Starting a Rails console
+
+```
+script/console
+```
+
+## Running Brakeman
+
+Run [Brakeman](https://brakemanscanner.org/) to highlight any security vulnerabilities:
+```bash
+brakeman
+```
+
+To pipe the results to a file:
+```bash
+brakeman -o report.text
+```
diff --git a/doc/managing-environment-variables.md b/doc/managing-environment-variables.md
new file mode 100644
index 000000000..2da653fb3
--- /dev/null
+++ b/doc/managing-environment-variables.md
@@ -0,0 +1,10 @@
+# Managing environment variables
+
+We use [Dotenv](https://github.com/bkeepers/dotenv) to manage our environment variables locally.
+
+The repository will include safe defaults for development in `/.env.example` and for test in `/.env.test`. We use 'example' instead of 'development' (from the Dotenv docs) to be consistent with current dxw conventions and to make it more explicit that these values are not to be committed.
+
+To manage sensitive environment variables:
+
+1. Add the new key and safe default value to the `/.env.example` file eg. `ROLLBAR_TOKEN=ROLLBAR_TOKEN`
+2. Add the new key and real value to your local `/.env.development.local` file, which should never be checked into Git. This file will look something like `ROLLBAR_TOKEN=123456789`
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index c2d813f79..71ae4de43 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -16,7 +16,7 @@ services:
        - .env.test
     environment:
       DATABASE_URL: postgres://postgres:password@test-db:5432/buy-for-your-school-test
-      REDIS_CACHE_URL: redis://test-redis:6379/1
+      REDIS_URL: redis://redis:6379
       DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
     networks:
       - test
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 5ac8bd1ab..a7a2c37f1 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -16,7 +16,7 @@ services:
        - .env.test
     environment:
       DATABASE_URL: postgres://postgres:password@test-db:5432/buy-for-your-school-test
-      REDIS_CACHE_URL: redis://test-redis:6379/1
+      REDIS_URL: redis://redis:6379
       DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
     volumes:
       - .:/srv/app
diff --git a/docker-compose.yml b/docker-compose.yml
index 563dd002d..4e6d8ed59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,7 @@ services:
        - .env.development.local
     environment:
       DATABASE_URL: postgres://postgres:password@db:5432/buy-for-your-school-development
-      REDIS_CACHE_URL: redis://redis:6379/1
-      REDIS_SIDEKIQ_URL: redis://redis:6379/2
+      REDIS_URL: redis://redis:6379
     volumes:
       - .:/srv/app
     tty: true
diff --git a/lib/dfe_sign_in.rb b/lib/dfe_sign_in.rb
new file mode 100644
index 000000000..e159425e2
--- /dev/null
+++ b/lib/dfe_sign_in.rb
@@ -0,0 +1,5 @@
+module DfESignIn
+  def self.bypass?
+    Rails.env.development? && ENV["DFE_SIGN_IN_ENABLED"] == "false"
+  end
+end
diff --git a/lib/specification_templates/catering.development.liquid b/lib/specification_templates/catering.development.liquid
deleted file mode 100644
index 5ba71c4e5..000000000
--- a/lib/specification_templates/catering.development.liquid
+++ /dev/null
@@ -1,36 +0,0 @@
-<article id="specification">
-  <section>
-    <h2>Menus and ordering</h2>
-    <h3>Food standards</h3>
-    <ol>
-      <li>
-        <p>It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p>The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p>It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      <!-- /food-standards -->
-      {% if answer_NxJWpbiFeEAmvcw17EysX %}
-        <li>
-          <p>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p>{{answer_NxJWpbiFeEAmvcw17EysX}}</p>
-        </li>
-      {% endif %}
-      <li>
-        <p>The supplier must work with the school to provide safe and enjoyable meals for any pupils with allergies or intolerances, ensuring that the ingredients, preparation and handling of food for those children are completely allergen-free.</p>
-      </li>
-      <!-- /track-allergens -->
-      {% if answer_5xxbqrasSXH9x9Lt3YhRkX contains "yes" %}
-        <li>
-          <p>The supplier is required to track allergen information through their supply chain and must be able to demonstrate their allergen tracking plan.</p>
-        </li>
-      {% endif %}
-      <!-- /food-objectives -->
-      {% if answer_4HfGoYL6s806Azx93jp5IY %}
-        <li>
-          <p>The school has the following objectives around the quantity, quality or variety of food offered, beyond the mandatory standards:</p>
-          <p>{{answer_4HfGoYL6s806Azx93jp5IY}}</p>
-        </li>
-      {% endif %}
-    </ol>
-  </section>
-</article>
diff --git a/lib/specification_templates/catering.production.liquid b/lib/specification_templates/catering.production.liquid
deleted file mode 100644
index 6d06700c5..000000000
--- a/lib/specification_templates/catering.production.liquid
+++ /dev/null
@@ -1,56 +0,0 @@
-<article id="specification">
-  <section>
-    <h2>Menus and ordering</h2>
-    <h3>Food standards</h3>
-    <ol>
-      <!-- 5. Static text -->
-      <li>
-        <p>It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p>The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p>It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      <!-- 6. /food-standards -->
-      {% if answer_2fVajdGxgwD58vt4VvAI9Y %}
-        <li>
-          <p>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p>{{answer_2fVajdGxgwD58vt4VvAI9Y}}</p>
-        </li>
-      {% endif %}
-      <!-- 8. -->
-      <li>
-        <p>The supplier must work with the school to provide safe and enjoyable meals for any pupils with allergies or intolerances, ensuring that the ingredients, preparation and handling of food for those children are completely allergen-free.</p>
-      </li>
-      <!-- 9. -->
-      <li>
-        <p>All food and drink must comply with food labelling law, which says you must provide information to customers on any of the 14 allergens used as ingredients in foods you make and sell. It is important that all staff receive training and information on the 14 allergens contained in food.</p>
-      </li>
-      <!-- 10. /detail-allergens-to-avoid -->
-      {% if answer_ypxhCAkhp2qmFiapHpVpK contains "Yes" %}
-        <li>
-          <p>All ingredients, handling and preparation of food and drink provided by the supplier must be free from:</p>
-          <p>{{answer_ypxhCAkhp2qmFiapHpVpK}}</p>
-        </li>
-      {% endif %}
-      <!-- 11. /track-allergens -->
-      {% if answer_5tq13woHxVnzfOZFixoqku contains "Yes" %}
-        <li>
-          <p>The supplier is required to track allergen information through their supply chain and must be able to demonstrate their allergen tracking plan.</p>
-        </li>
-      {% endif %}
-      <!-- 12. /meeting-standard-requirements -->
-      {% if answer_17OxghBLlrGQypc5NflRSW contains "Yes" %}
-        <li>
-          <p>The school has the following requirements for how the School Food Standards are met:</p>
-          <p>{{answer_17OxghBLlrGQypc5NflRSW}}</p>
-        </li>
-      {% endif %}
-      <!-- 13. /food-objectives -->
-      {% if answer_nJBe4ba05Av5JfKEFIxn7 %}
-        <li>
-          <p>The school has the following objectives around the quantity, quality or variety of food offered, beyond the mandatory standards:</p>
-          <p>{{answer_nJBe4ba05Av5JfKEFIxn7}}</p>
-        </li>
-      {% endif %}
-    </ol>
-  </section>
-</article>
diff --git a/lib/specification_templates/catering.test.liquid b/lib/specification_templates/catering.test.liquid
deleted file mode 100644
index 340b3c934..000000000
--- a/lib/specification_templates/catering.test.liquid
+++ /dev/null
@@ -1,19 +0,0 @@
-<article id="specification">
-  <section>
-    <h2 class="govuk-heading-m">Menus and ordering</h2>
-    <h3 class="govuk-heading-s">Food standards</h2>
-    <ol class="govuk-list govuk-list--number">
-      <li>
-        <p class="govuk-body">It will be the suppliers responsibility to ensure that all food served within the school day complies with both current and future government legislation and guidelines on the provision of healthy school meals. </p>
-        <p class="govuk-body">The supplier should encourage the use of seasonal produce and promotion of healthy eating to pupils wherever practical and desirable.</p>
-        <p class="govuk-body">It will be the suppliers responsibility to comply fully with DfE food and nutrient based standards, and to promote and comply with this policy throughout the contract term through effective menu planning.</p>
-      </li>
-      {% if answer_NxJWpbiFeEAmvcw17EysX %}
-        <li>
-          <p class="govuk-body">The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>
-          <p class="govuk-body">{{answer_NxJWpbiFeEAmvcw17EysX}}</p>
-        </li>
-      {% endif %}
-    </ul>
-  </section>
-</article>
diff --git a/lib/vcap_parser.rb b/lib/vcap_parser.rb
new file mode 100644
index 000000000..be047d9cc
--- /dev/null
+++ b/lib/vcap_parser.rb
@@ -0,0 +1,28 @@
+# Class to parse the VCAP_SERVICES environment variable.
+# Cloud Foundry provides an environment variable called VCAP_SERVICES which
+# contains JSON.
+# The JSON provides details of services bound to the application.
+# We parse this to generate environment variables to be used by Rails.
+class VcapParser
+  def self.load_service_environment_variables!
+    return if ENV["VCAP_SERVICES"].blank?
+
+    vcap_json = JSON.parse(ENV["VCAP_SERVICES"])
+    # Turn user provided service credentials into environment variables
+    vcap_json.fetch("user-provided", []).each do |service|
+      service["credentials"].each_pair do |key, value|
+        ENV[key] = value
+      end
+    end
+
+    load_redis_config(
+      vcap_json.fetch("redis", []).first
+    )
+  end
+
+  def self.load_redis_config(redis_config)
+    return unless redis_config
+    # Generate a REDIS_URL from the redis service uri
+    ENV["REDIS_URL"] = redis_config.fetch("credentials").fetch("uri")
+  end
+end
diff --git a/package-lock.json b/package-lock.json
index 95dc44d75..1447a4746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.10.2",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.10.2.tgz",
-      "integrity": "sha512-MpMymgLsKoMw40MggZ0XLCAj1FY5N2s8Pf3aQR+k0cZOsegjLsnejxNfEB9qEl9jcma2fiiVcvsEZ+Ipo+Oo2g=="
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.11.0.tgz",
+      "integrity": "sha512-1hW/3etYBtKPM+PNdWVOijvWVI3mpYL8eb7WLTtlh/Qxf2mCp6LkCsZk9I034n4EJBYQ5jlUWsUlTOOIypftpg=="
     }
   }
 }
diff --git a/package.json b/package.json
index ade382d33..aa1b68d7d 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,6 @@
   "name": "rails-template",
   "private": true,
   "dependencies": {
-    "govuk-frontend": "^3.10.2"
+    "govuk-frontend": "^3.11.0"
   }
 }
diff --git a/public/robots.txt b/public/robots.txt
index 37b576a4a..f7b7e314d 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1 +1,3 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+
+Disallow: /journeys/
diff --git a/script/deploy-terraform b/script/deploy-terraform
new file mode 100755
index 000000000..31bf595ea
--- /dev/null
+++ b/script/deploy-terraform
@@ -0,0 +1,53 @@
+#!/bin/bash
+# script to deploy terraform
+# exit on error or if a variable is unbound
+set -eu
+
+TF_VAR_environment="${TF_VAR_environment:-}"
+
+if [ -z "$TF_VAR_environment" ]
+then
+  echo "TF_VAR_environment not set. Exiting ..."
+  exit 1
+fi
+
+# Set env_TF_VAR_ environment variables from GITHUB_SECRETS_JSON
+eval $(echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith($e + "_TF_VAR_") ) ) | keys[] as $k | "export \($k[($e + "_" | length):])=\(.[$k])"')
+
+# Disable the shellcheck check for unassigned variables. We export this var
+# in Github Actions, but Shellcheck complains because there are lowercase
+# characters in it
+
+# shellcheck disable=2154
+echo "deploying $TF_VAR_environment"
+
+cd terraform/app
+
+# Create app_env yaml file from GITHUB_SECRETS_JSON
+echo "---" > "${TF_VAR_environment}_app_env.yml"
+echo "$GITHUB_SECRETS_JSON" | jq -r --arg e "$(echo "$TF_VAR_environment" | awk '{ print toupper($0) }' )" 'with_entries(select(.key | startswith("APP_ENV_" + $e) ) ) | keys[] as $k | "\($k[("APP_ENV_" + $e + "_" | length):]): \(.[$k])"' >> "${TF_VAR_environment}_app_env.yml"
+
+# deploy terraform using tfenv
+if [ ! -e ~/.tfenv ]
+then
+git clone https://github.com/tfutils/tfenv.git ~/.tfenv
+fi
+export PATH="$HOME/.tfenv/bin:$PATH"
+tfenv install
+
+# CF_PASSWORD, CF_USER, AWS_SECRET_ACCESS_KEY and AWS_ACCESS_KEY_ID
+# must be set for the following commands to run
+
+# initialise terraform
+terraform init
+
+# select the correct workspace
+terraform workspace select "$TF_VAR_environment"
+
+# plan the terraform
+terraform plan
+
+# apply the terraform
+terraform apply -auto-approve
+
+echo "$TF_VAR_environment has been deployed"
diff --git a/script/docker-push-ghcr b/script/docker-push-ghcr
new file mode 100755
index 000000000..184cd1944
--- /dev/null
+++ b/script/docker-push-ghcr
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# exit on failures
+set -e
+set -o pipefail
+
+echo "$GHCR_PASSWORD" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin
+docker build --build-arg RAILS_ENV=production  -t "$GHCR_REPO:$DOCKER_TAG" .
+docker push "$GHCR_REPO:$DOCKER_TAG"
diff --git a/script/test b/script/test
index 183f44149..92dd1c595 100755
--- a/script/test
+++ b/script/test
@@ -6,3 +6,4 @@
 set -e
 
 bundle exec rake
+bundle exec brakeman -o /dev/stdout
diff --git a/spec/factories/answer.rb b/spec/factories/answer.rb
index 48e361a25..2b174a61e 100644
--- a/spec/factories/answer.rb
+++ b/spec/factories/answer.rb
@@ -27,6 +27,19 @@
   factory :checkbox_answers do
     association :step, factory: :step, options: [{"value" => "Breakfast"}, {"value" => "Lunch"}], contentful_type: "checkboxes", contentful_model: "question"
 
-    response { ["breakfast", "lunch", ""] }
+    response { ["Breakfast", "Lunch", ""] }
+    skipped { false }
+  end
+
+  factory :number_answer do
+    association :step, factory: :step, contentful_type: "number", contentful_model: "question"
+
+    response { 150 }
+  end
+
+  factory :currency_answer do
+    association :step, factory: :step, contentful_type: "currency", contentful_model: "question"
+
+    response { 1000.01 }
   end
 end
diff --git a/spec/factories/journey.rb b/spec/factories/journey.rb
index c24800da3..2ca6309be 100644
--- a/spec/factories/journey.rb
+++ b/spec/factories/journey.rb
@@ -1,8 +1,10 @@
 FactoryBot.define do
   factory :journey do
     category { "catering" }
-    next_entry_id { "47EI2X2T5EDTpJX9WjRR9p" }
     liquid_template { "Your answer was {{ answer_47EI2X2T5EDTpJX9WjRR9p }}" }
+    section_groups { [] }
+
+    association :user, factory: :user
 
     trait :catering do
       category { "catering" }
diff --git a/spec/factories/step.rb b/spec/factories/step.rb
index 016694639..c2d75527f 100644
--- a/spec/factories/step.rb
+++ b/spec/factories/step.rb
@@ -2,8 +2,12 @@
   factory :step do
     title { "What is your favourite colour?" }
     help_text { "Choose the primary colour closest to your choice" }
-    raw { {"sys": {"id" => "123"}} }
-    contentful_id { "123" }
+    contentful_id { SecureRandom.hex }
+    raw { |attrs| {"sys": {"id" => attrs["contentful_id"]}} }
+    hidden { false }
+    additional_step_rules { nil }
+    primary_call_to_action_text { nil }
+    skip_call_to_action_text { nil }
 
     association :journey, factory: :journey
 
@@ -11,35 +15,42 @@
       options { [{"value" => "Red"}, {"value" => "Green"}, {"value" => "Blue"}] }
       contentful_model { "question" }
       contentful_type { "radios" }
-      association :radio_answer
     end
 
     trait :short_text do
       options { nil }
       contentful_model { "question" }
       contentful_type { "short_text" }
-      association :short_text_answer
     end
 
     trait :long_text do
       options { nil }
       contentful_model { "question" }
       contentful_type { "long_text" }
-      association :long_text_answer
     end
 
     trait :single_date do
       options { nil }
       contentful_model { "question" }
       contentful_type { "single_date" }
-      association :single_date_answer
     end
 
     trait :checkbox_answers do
       options { [{"value" => "Brown"}, {"value" => "Gold"}] }
       contentful_model { "question" }
       contentful_type { "checkboxes" }
-      association :checkbox_answers
+    end
+
+    trait :number do
+      options { nil }
+      contentful_model { "question" }
+      contentful_type { "number" }
+    end
+
+    trait :currency do
+      options { nil }
+      contentful_model { "question" }
+      contentful_type { "currency" }
     end
 
     trait :static_content do
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
new file mode 100644
index 000000000..4bad747aa
--- /dev/null
+++ b/spec/factories/user.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :user do
+    dfe_sign_in_uid { SecureRandom.uuid }
+  end
+end
diff --git a/spec/features/school_buying_professionals/complete_a_journey_spec.rb b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
new file mode 100644
index 000000000..b54a48218
--- /dev/null
+++ b/spec/features/school_buying_professionals/complete_a_journey_spec.rb
@@ -0,0 +1,472 @@
+require "rails_helper"
+
+feature "Anyone can start a journey" do
+  before { user_is_signed_in }
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
+    ) do
+      example.run
+    end
+  end
+
+  scenario "Start page includes a call to action" do
+    start_journey_from_category(category: "radio-question.json")
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+    expect(page).to have_content("Which service do you need?")
+    expect(page).to have_content("Not started")
+  end
+
+  scenario "an answer must be provided" do
+    start_journey_from_category_and_go_to_question(category: "radio-question.json")
+
+    # Omit a choice
+
+    click_on(I18n.t("generic.button.next"))
+
+    expect(page).to have_content("can't be blank")
+  end
+
+  context "when the Contentful model is of type question" do
+    context "when Contentful entry is of type short_text" do
+      scenario "user can answer using free text" do
+        start_journey_from_category_and_go_to_question(category: "short-text-question.json")
+
+        fill_in "answer[response]", with: "email@example.com"
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("email@example.com")
+      end
+    end
+
+    context "when Contentful entry is of type numbers" do
+      scenario "user can answer using a number input" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "190"
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("190")
+      end
+
+      scenario "users receive an error when not entering a number" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "foo"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("is not a number")
+      end
+
+      scenario "users receive an error when entering a decimal number" do
+        start_journey_from_category_and_go_to_question(category: "number-question.json")
+
+        fill_in "answer[response]", with: "435.65"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("must be an integer")
+      end
+    end
+
+    context "when Contentful entry is of type currency" do
+      scenario "user can answer using a currency number input" do
+        start_journey_from_category_and_go_to_question(category: "currency-question.json")
+
+        fill_in "answer[response]", with: "1,000.01"
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("1000.01")
+      end
+
+      scenario "throws error when non numerical values are entered" do
+        start_journey_from_category_and_go_to_question(category: "currency-question.json")
+
+        fill_in "answer[response]", with: "one hundred pounds"
+        click_on(I18n.t("generic.button.next"))
+
+        expect(page).to have_content("does not accept £ signs or other non numerical characters")
+      end
+    end
+
+    context "when Contentful entry is of type long_text" do
+      scenario "user can answer using free text with multiple lines" do
+        start_journey_from_category_and_go_to_question(category: "long-text-question.json")
+
+        fill_in "answer[response]", with: "We would like a supplier to provide catering from September 2020.\nThey must be able to supply us for 3 years minumum."
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer-response-field").value).to eql("We would like a supplier to provide catering from September 2020.\r\nThey must be able to supply us for 3 years minumum.")
+      end
+    end
+
+    context "when Contentful entry is of type single_date" do
+      scenario "user can answer using a date input" do
+        start_journey_from_category_and_go_to_question(category: "single-date-question.json")
+
+        fill_in "answer[response(3i)]", with: "12"
+        fill_in "answer[response(2i)]", with: "8"
+        fill_in "answer[response(1i)]", with: "2020"
+
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(find_field("answer_response_3i").value).to eql("12")
+        expect(find_field("answer_response_2i").value).to eql("8")
+        expect(find_field("answer_response_1i").value).to eql("2020")
+      end
+
+      scenario "date validations" do
+        start_journey_from_category_and_go_to_question(category: "single-date-question.json")
+
+        fill_in "answer[response(3i)]", with: "2"
+        fill_in "answer[response(2i)]", with: "0"
+        fill_in "answer[response(1i)]", with: "0"
+
+        click_on(I18n.t("generic.button.next"))
+        expect(page).to have_content(I18n.t("activerecord.errors.models.single_date_answer.attributes.response"))
+      end
+    end
+
+    context "when Contentful entry is of type checkboxes" do
+      scenario "user can select multiple answers" do
+        start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
+
+        check "Breakfast"
+        check "Lunch"
+
+        click_on(I18n.t("generic.button.next"))
+
+        click_first_link_in_task_list
+
+        expect(page).to have_checked_field("answer-response-breakfast-field")
+        expect(page).to have_checked_field("answer-response-lunch-field")
+      end
+
+      scenario "options follow the capitalisation given" do
+        start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
+        expect(page).to have_content("Morning break")
+      end
+
+      context "when extra configuration is passed to collect further info" do
+        scenario "asks the user for further information" do
+          start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
+
+          check("Yes")
+          fill_in "answer[yes_further_information]", with: "The first piece of further information"
+
+          check("No")
+          expect(page).not_to have_content("No_further_information") # It should not create a label when text for one isn't provided
+          within("span.govuk-visually-hidden") do
+            expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
+          end
+          fill_in "answer[no_further_information]", with: "A second piece of further information"
+
+          # We are testing a value that includes a comma
+          check("Other, please specify")
+          fill_in "answer[other_please_specify_further_information]", with: "Other information"
+
+          click_on(I18n.t("generic.button.next"))
+
+          click_first_link_in_task_list
+
+          expect(page).to have_checked_field("Yes")
+          expect(find_field("answer-yes-further-information-field").value)
+            .to eql("The first piece of further information")
+
+          expect(page).to have_checked_field("No")
+          expect(find_field("answer-no-further-information-field").value)
+            .to eql("A second piece of further information")
+
+          expect(page).to have_checked_field("Other, please specify")
+          expect(find_field("answer-other-please-specify-further-information-field").value)
+            .to eql("Other information")
+        end
+      end
+
+      context "when extended question is of type single" do
+        scenario "a single text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
+
+          check("Yes")
+
+          expect(page).to have_selector("input#answer-yes-further-information-field")
+        end
+      end
+
+      context "when extended question is of type long" do
+        scenario "a long text area is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-long-answer-checkboxes-question.json")
+
+          check("Yes")
+
+          expect(page).to have_selector("textarea#answer-yes-further-information-field")
+        end
+      end
+
+      context "when there is no extended question" do
+        scenario "no extra text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "checkboxes-question.json")
+
+          expect(page).to_not have_selector("textarea#answer-yes-further-information-field")
+          expect(page).to_not have_selector("input#answer-yes-further-information-field")
+        end
+      end
+    end
+
+    context "when Contentful entry is of type radios" do
+      context "when extra configuration is passed to collect further info" do
+        scenario "asks the user for further information" do
+          start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
+
+          choose("Catering")
+          expect(page).not_to have_content("No_further_information") # It should not create a label when one isn't specified
+          within("span.govuk-visually-hidden") do
+            expect(page).to have_content("Optional further information") # Default the hidden label to something understandable for screen readers
+          end
+
+          fill_in "answer[catering_further_information]", with: "The school needs the kitchen cleaned once a day"
+
+          click_on(I18n.t("generic.button.next"))
+
+          click_first_link_in_task_list
+
+          expect(page).to have_checked_field("Catering")
+          expect(find_field("answer-catering-further-information-field").value)
+            .to eql("The school needs the kitchen cleaned once a day")
+        end
+      end
+
+      context "when extended question is of type single" do
+        scenario "a single text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
+
+          choose("Catering")
+
+          expect(page).to have_selector("input#answer-catering-further-information-field")
+        end
+      end
+
+      context "when extended question is of type long" do
+        scenario "a long text area is displayed" do
+          start_journey_from_category_and_go_to_question(category: "extended-long-answer-radio-question.json")
+
+          choose("Catering")
+
+          expect(page).to have_selector("textarea#answer-catering-further-information-field")
+        end
+      end
+
+      context "when there is no extended question" do
+        scenario "no extra text field is displayed" do
+          start_journey_from_category_and_go_to_question(category: "radio-question.json")
+
+          expect(page).to_not have_selector("textarea#answer-catering-further-information-field")
+          expect(page).to_not have_selector("input#answer-catering-further-information-field")
+        end
+      end
+
+      context "when an 'or separator' has been configured" do
+        scenario "shows an or separator" do
+          start_journey_from_category_and_go_to_question(category: "radio-question-with-separator.json")
+
+          expect(page).to have_selector("div.govuk-radios__divider")
+          within("div.govuk-radios__divider") do
+            expect(page).to have_content("or")
+          end
+
+          # Check that the "Or" separator appears in the correct position
+          expect(page.body.index("Catering") > page.body.index("or")).to eq(true)
+          expect(page.body.index("or") < page.body.index("Cleaning")).to eq(true)
+        end
+      end
+    end
+
+    context "when Contentful entry includes a 'show additional question' rule" do
+      scenario "additional questions are shown" do
+        start_journey_from_category_and_go_to_question(category: "show-one-additional-question.json")
+
+        choose("School expert")
+        click_on(I18n.t("generic.button.next"))
+
+        # This question should be made visible after the previous step
+        expect(page).not_to have_content("You should NOT be able to see this question?")
+        click_on("What colour is the sky?")
+        choose("Red")
+        click_on(I18n.t("generic.button.next"))
+
+        # This question should only be made visible after the previous step
+        click_on("You should NOT be able to see this question?")
+        choose("School expert")
+        click_on(I18n.t("generic.button.next"))
+      end
+    end
+  end
+
+  context "when the question is skippable" do
+    scenario "allows the user to not select an answer" do
+      start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
+
+      click_on(I18n.t("generic.button.next"))
+      expect(page).to have_content("can't be blank")
+
+      check("Lunch")
+      check("Dinner")
+      click_on(I18n.t("generic.button.next"))
+
+      click_first_link_in_task_list
+
+      click_on("None of the above")
+
+      within(".app-task-list") do
+        expect(page).to have_content("Complete")
+      end
+
+      click_first_link_in_task_list
+
+      expect(page).not_to have_checked_field("Lunch")
+      expect(CheckboxAnswers.last.skipped).to be true
+    end
+
+    context "when the question has already been skipped" do
+      scenario "selecting an answer marks the question as not being skipped" do
+        start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
+
+        click_on("None of the above")
+
+        within(".app-task-list") do
+          expect(page).to have_content("Complete")
+        end
+
+        click_first_link_in_task_list
+
+        check("Lunch")
+        check("Dinner")
+        click_on(I18n.t("generic.button.update"))
+
+        expect(CheckboxAnswers.last.skipped).to be false
+      end
+    end
+  end
+
+  context "when the Contentful model is of type staticContent" do
+    context "when Contentful entry is of type paragraphs" do
+      scenario "the content is not displayed in the task list" do
+        start_journey_from_category(category: "static-content.json")
+
+        # We should really remove static content entirely, since it doesn't
+        # appear in the task list pattern.
+
+        # TODO: Talk to design and see if static content is actually included
+        # anywhere in the journey, or if we can ditch support.
+
+        expect(page).not_to have_content("When you should start")
+      end
+    end
+  end
+
+  context "when the help text contains Markdown" do
+    scenario "paragraph breaks are parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<p>Paragraph Test: Paragraph 1</p>")
+      expect(page.html).to include("<p>Paragraph Test: Paragraph 2</p>")
+    end
+
+    scenario "bold text is parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<strong>Bold text</strong> test")
+    end
+
+    scenario "lists are parsed as expected" do
+      start_journey_from_category_and_go_to_question(category: "markdown-help-text.json")
+
+      expect(page.html).to include("<li>List item one</li>")
+      expect(page.html).to include("<li>List item two</li>")
+      expect(page.html).to include("<li>List item three</li>")
+    end
+  end
+
+  context "when the help text is nil" do
+    scenario "step page still renders when question is a radio" do
+      start_journey_from_category_and_go_to_question(category: "nil-help-text-radios.json")
+
+      expect(page.html).to include("Which service do you need?")
+    end
+
+    scenario "step page still renders when question is a short text" do
+      start_journey_from_category_and_go_to_question(category: "nil-help-text-short-text.json")
+
+      expect(page.html).to include("What email address did you use?")
+    end
+  end
+
+  context "when Contentful entry model wasn't an expected type" do
+    scenario "returns an error message" do
+      stub_contentful_category(fixture_filename: "unexpected-contentful-type.json")
+
+      visit new_journey_path
+
+      expect(page).to have_content(I18n.t("errors.unexpected_contentful_model.page_title"))
+      expect(page).to have_content(I18n.t("errors.unexpected_contentful_model.page_body"))
+    end
+  end
+
+  context "when the Contentful Entry wasn't an expected question type" do
+    scenario "returns an error message" do
+      stub_contentful_category(fixture_filename: "unexpected-contentful-question-type.json")
+
+      visit new_journey_path
+
+      expect(page).to have_content(I18n.t("errors.unexpected_contentful_step_type.page_title"))
+      expect(page).to have_content(I18n.t("errors.unexpected_contentful_step_type.page_body"))
+    end
+  end
+
+  context "when the starting entry id doesn't exist" do
+    scenario "a Contentful entry_id does not exist" do
+      allow(stub_contentful_connector).to receive(:get_entry_by_id)
+        .with("contentful-category-entry")
+        .and_return(nil)
+
+      visit new_journey_path
+
+      expect(page).to have_content(I18n.t("errors.contentful_entry_not_found.page_title"))
+      expect(page).to have_content(I18n.t("errors.contentful_entry_not_found.page_body"))
+    end
+  end
+
+  context "when the Liquid template was invalid" do
+    it "raises an error" do
+      start_journey_from_category(category: "category-with-invalid-liquid-template.json")
+
+      expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_title"))
+      expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_body"))
+    end
+  end
+
+  context "when a user answers a question" do
+    scenario "the user is returned to the same place in the task list " do
+      start_journey_from_category_and_go_to_question(category: "long-text-question.json")
+      journey = Journey.last
+
+      fill_in "answer[response]", with: "This is my long answer"
+
+      click_on(I18n.t("generic.button.next"))
+
+      answer = LongTextAnswer.last
+
+      expect(page).to have_current_path(journey_url(journey, anchor: answer.step.id))
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
new file mode 100644
index 000000000..46ab519db
--- /dev/null
+++ b/spec/features/school_buying_professionals/download_their_catering_specification_spec.rb
@@ -0,0 +1,54 @@
+feature "Users can see their catering specification" do
+  before { user_is_signed_in }
+
+  context "when the journey has been completed" do
+    scenario "HTML" do
+      start_journey_from_category_and_go_to_question(category: "category-with-liquid-template.json")
+
+      common_specification_html = "<article id='specification'><h1>Liquid </h1></article>"
+      expect(Htmltoword::Document)
+        .to receive(:create)
+        .with(common_specification_html, nil, false)
+        .and_call_original
+
+      choose("Catering")
+
+      click_on(I18n.t("generic.button.next"))
+
+      click_on(I18n.t("journey.specification.button"))
+
+      expect(page).to have_content(I18n.t("journey.specification.header"))
+
+      click_on("Download (.docx)")
+
+      expect(page.response_headers["Content-Type"]).to eql("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+      header = page.response_headers["Content-Disposition"]
+      expect(header).to match(/^attachment/)
+      expect(header).to match(/filename="specification.docx"/)
+    end
+  end
+
+  context "when the journey has not yet been completed" do
+    scenario "includes an incomple warning" do
+      start_journey_from_category(
+        category: "category-with-liquid-template.json"
+      )
+
+      # Omit answering a question to simulate an incomplete spec
+
+      click_on(I18n.t("journey.specification.button"))
+
+      warning_html = I18n.t("journey.specification.download.warning.incomplete")
+      common_specification_html = "<article id='specification'><h1>Liquid </h1></article>"
+      expect(page).not_to have_content(Nokogiri::HTML(warning_html).text)
+      expect(Htmltoword::Document)
+        .to receive(:create)
+        .with(common_specification_html.prepend(warning_html), nil, false)
+        .and_call_original
+
+      click_on("Download (.docx)")
+
+      expect(page.response_headers["Content-Disposition"]).to match(/filename="specification-incomplete.docx"/)
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/edit_their_answers_spec.rb b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
new file mode 100644
index 000000000..8ca1b549d
--- /dev/null
+++ b/spec/features/school_buying_professionals/edit_their_answers_spec.rb
@@ -0,0 +1,147 @@
+require "rails_helper"
+
+feature "Users can edit their answers" do
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
+
+  before do
+    journey = answer.step.journey
+    journey.update(
+      user: user,
+      section_groups: [
+        {
+          "order" => 0,
+          "title" => "Section A",
+          "steps" => [
+            {
+              "contentful_id" => answer.step.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+    )
+  end
+  let(:answer) { create(:short_text_answer, response: "answer") }
+
+  context "when the question is short_text" do
+    let(:answer) { create(:short_text_answer, response: "answer") }
+
+    scenario "The edited answer is saved" do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      fill_in "answer[response]", with: "email@example.com"
+
+      click_on(I18n.t("generic.button.update"))
+
+      click_on(answer.step.title)
+
+      expect(find_field("answer-response-field").value).to eql("email@example.com")
+    end
+  end
+
+  context "when the question is single_date" do
+    let(:answer) { create(:single_date_answer, response: 1.year.ago) }
+
+    scenario "The edited answer is saved" do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      fill_in "answer[response(3i)]", with: "12"
+      fill_in "answer[response(2i)]", with: "8"
+      fill_in "answer[response(1i)]", with: "2020"
+
+      click_on(I18n.t("generic.button.update"))
+
+      click_on(answer.step.title)
+
+      expect(find_field("answer_response_3i").value).to eql("12")
+      expect(find_field("answer_response_2i").value).to eql("8")
+      expect(find_field("answer_response_1i").value).to eql("2020")
+    end
+  end
+
+  context "when the question is checkbox_answers" do
+    let(:answer) { create(:checkbox_answers, response: ["Breakfast", "Lunch", ""]) }
+
+    scenario "The edited answer is saved" do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      uncheck "Breakfast"
+
+      click_on(I18n.t("generic.button.update"))
+
+      click_on(answer.step.title)
+
+      expect(page).not_to have_checked_field("answer-response-breakfast-field")
+      expect(page).to have_checked_field("answer-response-lunch-field")
+    end
+  end
+
+  context "An error is thrown" do
+    scenario "When an answer is invalid" do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      fill_in "answer[response]", with: ""
+
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).to have_content("can't be blank")
+    end
+  end
+
+  context "when Contentful entry includes a 'show additional question' rule" do
+    scenario "an additional question is shown" do
+      start_journey_from_category_and_go_to_question(category: "show-one-additional-question.json")
+
+      choose("School expert")
+      click_on(I18n.t("generic.button.next"))
+
+      # This question should be made visible after the previous step
+      click_on("What colour is the sky?")
+      choose("Red")
+      click_on(I18n.t("generic.button.next"))
+
+      # This question should be made visible after the previous step
+      click_on("You should NOT be able to see this question?")
+      choose("School expert")
+      click_on(I18n.t("generic.button.next"))
+
+      # Edit the first question to remove the chain of hidden questions
+      click_on("What support do you have available?")
+      choose("None")
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).not_to have_content("What colour is the sky? ")
+      expect(page).not_to have_content("You should NOT be able to see this question?")
+
+      # Edit the first question to add back the full chain of hidden questions
+      click_on("What support do you have available?")
+      choose("School expert")
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).to have_content("What colour is the sky? ")
+      expect(page).to have_content("You should NOT be able to see this question?")
+    end
+  end
+  context "when a user edits an answer" do
+    scenario "the user is returned to the same place in the task list " do
+      visit journey_path(answer.step.journey)
+
+      click_on(answer.step.title)
+
+      fill_in "answer[response]", with: "email@example.com"
+
+      click_on(I18n.t("generic.button.update"))
+
+      expect(page).to have_current_path(journey_url(answer.step.journey, anchor: answer.step.id))
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb b/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
new file mode 100644
index 000000000..e1e2b31d7
--- /dev/null
+++ b/spec/features/school_buying_professionals/preview_a_journey_step_spec.rb
@@ -0,0 +1,16 @@
+feature "Users can preview a journey step" do
+  scenario "the appropriate step is displayed" do
+    stub_contentful_entry(
+      entry_id: "radio-question",
+      fixture_filename: "steps/radio-question.json"
+    )
+
+    user_is_signed_in
+
+    visit preview_entry_path("radio-question")
+
+    expect(page).to have_content("Which service do you need?")
+    expect(page).to have_content("Catering")
+    expect(page).to have_content("Cleaning")
+  end
+end
diff --git a/spec/features/school_buying_professionals/resume_a_journey_spec.rb b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
new file mode 100644
index 000000000..4c5fd4b87
--- /dev/null
+++ b/spec/features/school_buying_professionals/resume_a_journey_spec.rb
@@ -0,0 +1,20 @@
+require "rails_helper"
+
+feature "Users can see how to resume a journey" do
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
+
+  context "on the task list" do
+    let(:journey) { create(:journey, user: user) }
+
+    scenario "displays the notification banner" do
+      visit journey_path(journey)
+      expect(page).to have_content(I18n.t("resume.notification.title"))
+    end
+
+    scenario "displays the journey URL" do
+      visit journey_path(journey)
+      expect(page).to have_content(journey_url(journey))
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb b/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
new file mode 100644
index 000000000..4365369b6
--- /dev/null
+++ b/spec/features/school_buying_professionals/see_the_map_of_journey_steps_page_spec.rb
@@ -0,0 +1,111 @@
+feature "Users can see all the steps of a journey" do
+  before { user_is_signed_in }
+
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
+    ) do
+      example.run
+    end
+  end
+
+  scenario "Multiple journey steps" do
+    stub_contentful_category(
+      fixture_filename: "journey-with-multiple-entries.json"
+    )
+
+    visit new_journey_map_path
+
+    expect(page).to have_content(I18n.t("journey_map.page_title"))
+
+    within(".govuk-list") do
+      list_items = find_all("li")
+      within(list_items[0]) do
+        expect(page)
+          .to have_content(
+            "Which service do you need?"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.edit_step_link_text"),
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/radio-question"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("radio-question")
+          )
+        expect(page)
+          .to have_content(
+            "{{ answer_radio-question }}"
+          )
+      end
+      within(list_items[1]) do
+        expect(page)
+          .to have_content(
+            "What email address did you use?"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.edit_step_link_text"),
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/short-text-question"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("short-text-question")
+          )
+        expect(page)
+          .to have_content(
+            "{{ answer_short-text-question }}"
+          )
+      end
+      within(list_items[2]) do
+        expect(page)
+          .to have_content(
+            "Describe what you need"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.edit_step_link_text"),
+            href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/long-text-question"
+          )
+        expect(page)
+          .to have_link(
+            I18n.t("journey_map.preview_step_link_text"),
+            href: preview_entry_path("long-text-question")
+          )
+        expect(page)
+          .to have_content(
+            "{{ answer_long-text-question }}"
+          )
+      end
+    end
+  end
+
+  context "when the map isn't valid" do
+    context "when the same entry is found twice" do
+      around do |example|
+        ClimateControl.modify(
+          CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
+        ) do
+          example.run
+        end
+      end
+
+      it "returns an error message" do
+        stub_contentful_category(
+          fixture_filename: "journey-with-repeat-entries.json",
+          stub_steps: false
+        )
+
+        visit new_journey_map_path
+
+        expect(page).to have_content(I18n.t("errors.repeat_step_in_the_contentful_journey.page_title"))
+        expect(page).to have_content(
+          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "radio-question")
+        )
+      end
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
new file mode 100644
index 000000000..4cecd7834
--- /dev/null
+++ b/spec/features/school_buying_professionals/see_their_catering_specification_spec.rb
@@ -0,0 +1,86 @@
+feature "Users can see their catering specification" do
+  before { user_is_signed_in }
+
+  scenario "HTML" do
+    start_journey_from_category_and_go_to_question(category: "category-with-dynamic-liquid-template.json")
+
+    choose("Catering")
+    click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
+
+    expect(page).to have_content(I18n.t("journey.specification.header"))
+
+    within("article#specification") do
+      expect(page).to have_content("Menus and ordering")
+      expect(page).to have_content("Food standards")
+      expect(page).to have_content("The school also requires the service to comply with the following non-mandatory food standards or schemes:")
+      expect(page).to have_content("Catering")
+    end
+  end
+
+  scenario "navigates back to the task list" do
+    start_journey_from_category(category: "extended-radio-question.json")
+
+    click_on(I18n.t("journey.specification.button"))
+
+    click_on(I18n.t("generic.button.back"))
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+  end
+
+  scenario "renders radio responses that have futher information" do
+    start_journey_from_category_and_go_to_question(category: "extended-radio-question.json")
+
+    choose("Catering")
+    fill_in "answer[catering_further_information]", with: "The school needs the kitchen cleaned once a day"
+    click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
+
+    expect(page).to have_content(I18n.t("journey.specification.header"))
+
+    within("article#specification") do
+      expect(page).to have_content("Catering")
+      expect(page).to have_content("The school needs the kitchen cleaned once a day")
+    end
+  end
+
+  scenario "renders checkbox responses that have further information" do
+    start_journey_from_category_and_go_to_question(category: "extended-checkboxes-question.json")
+
+    check("Yes")
+    fill_in "answer[yes_further_information]", with: "More info for yes"
+    check("No")
+    fill_in "answer[no_further_information]", with: "More info for no"
+
+    click_on(I18n.t("generic.button.next"))
+    click_on(I18n.t("journey.specification.button"))
+
+    expect(page).to have_content(I18n.t("journey.specification.header"))
+
+    within("article#specification") do
+      expect(page).to have_content("yes")
+      expect(page).to have_content("More info for yes")
+      expect(page).to have_content("no")
+      expect(page).to have_content("More info for no")
+    end
+  end
+
+  scenario "questions that are skipped can be identified" do
+    start_journey_from_category_and_go_to_question(category: "skippable-checkboxes-question.json")
+
+    click_on("None of the above")
+    click_on(I18n.t("journey.specification.button"))
+
+    expect(page).to have_content("Skipped question detected")
+  end
+
+  context "when the spec is incomplete" do
+    it "warns the user that the contents are in a partially completed state" do
+      start_journey_from_category(category: "extended-radio-question.json")
+
+      # Don't answer any questions to create a in progress spec
+
+      click_on(I18n.t("journey.specification.button"))
+      expect(page).to have_content("You have not completed all the tasks. There may be information missing from your specification.")
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/view_a_dashboard_spec.rb b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
new file mode 100644
index 000000000..a55be68e5
--- /dev/null
+++ b/spec/features/school_buying_professionals/view_a_dashboard_spec.rb
@@ -0,0 +1,50 @@
+require "rails_helper"
+
+feature "Anyone can view a dashboard" do
+  before { user_is_signed_in }
+
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
+    ) do
+      example.run
+    end
+  end
+
+  scenario "Dashboard displays the title" do
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
+
+  scenario "user can view existing specifications" do
+    user = create(:user)
+    user_is_signed_in(user: user)
+    create(:journey, user: user, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.existing.header"))
+    expect(page).to have_content(I18n.t("dashboard.existing.body"))
+
+    click_on(I18n.t("dashboard.existing.link"))
+
+    expect(page).to have_content(I18n.t("journey.index.existing.header"))
+    expect(page).to have_content("15 February 2021")
+  end
+
+  scenario "user can start a new specification" do
+    stub_contentful_category(fixture_filename: "radio-question.json")
+
+    visit dashboard_path
+
+    expect(page).to have_content(I18n.t("dashboard.create.header"))
+    expect(page).to have_content(I18n.t("dashboard.create.body"))
+
+    click_on(I18n.t("dashboard.create.link"))
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+    expect(page).to have_content("Which service do you need?")
+    expect(page).to have_content("Not started")
+  end
+end
diff --git a/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
new file mode 100644
index 000000000..d509dcfbc
--- /dev/null
+++ b/spec/features/school_buying_professionals/view_a_list_of_tasks_spec.rb
@@ -0,0 +1,71 @@
+require "rails_helper"
+
+feature "Users can view the task list" do
+  let(:user) { create(:user) }
+  before { user_is_signed_in(user: user) }
+
+  it "tasks are grouped by their section" do
+    start_journey_from_category(category: "multiple-sections.json")
+
+    within(".app-task-list") do
+      expect(page).to have_content("Section A")
+      expect(page).to have_content("Section B")
+    end
+
+    task_lists = find_all(".app-task-list__items")
+
+    within(task_lists[0]) do
+      expect(page).to have_content("Which service do you need?")
+    end
+
+    within(task_lists[1]) do
+      expect(page).to have_content("Describe what you need")
+    end
+  end
+
+  scenario "user can navigate back to the dashboard" do
+    start_journey_from_category(category: "extended-radio-question.json")
+
+    click_on(I18n.t("generic.button.back"))
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
+
+  context "When a question has been answered" do
+    scenario "The task is marked as completed" do
+      stub_contentful_category(fixture_filename: "multiple-sections.json")
+
+      answer = create(:short_text_answer, response: "answer")
+      answer.step.journey.update(
+        user: user,
+        section_groups: [
+          {
+            "order" => 0,
+            "title" => "Section A",
+            "steps" => [
+              {
+                "contentful_id" => answer.step.contentful_id,
+                "order" => 0
+              }
+            ]
+          }
+        ]
+      )
+
+      user_starts_the_journey
+
+      visit journey_path(answer.step.journey)
+
+      expect(page).to have_content(I18n.t("task_list.status.completed"))
+    end
+  end
+
+  context "When a question has been hidden" do
+    it "should not appear in the task list" do
+      start_journey_from_category(category: "hidden-field.json")
+
+      expect(page).not_to have_content("You should NOT be able to see this question")
+      expect(page).to have_content("You should be able to see this question")
+    end
+  end
+end
diff --git a/spec/features/school_buying_professionals/view_existing_journeys_spec.rb b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
new file mode 100644
index 000000000..268d77f6b
--- /dev/null
+++ b/spec/features/school_buying_professionals/view_existing_journeys_spec.rb
@@ -0,0 +1,45 @@
+require "rails_helper"
+
+feature "Users can view their existing journeys" do
+  before { user_is_signed_in }
+
+  it "displays the page header" do
+    visit journeys_path
+    expect(page).to have_content(I18n.t("journey.index.existing.header"))
+  end
+
+  it "lists existing journeys" do
+    user = create(:user)
+    user_is_signed_in(user: user)
+    create(:journey, user: user, created_at: Time.local(2021, 2, 15, 12, 0, 0))
+    create(:journey, user: user, created_at: Time.local(2021, 3, 20, 12, 0, 0))
+
+    visit journeys_path
+
+    expect(page).to have_content("15 February 2021")
+    expect(page).to have_content("20 March 2021")
+  end
+
+  context "when the journey does not belong to the user" do
+    scenario "that journey is not shown" do
+      travel_to Time.zone.local(2021, 2, 15, 12, 0, 0)
+
+      another_user = create(:user)
+      _another_users_journey = create(:journey,
+        user: another_user,
+        created_at: Time.local(2021, 3, 20, 12, 0, 0))
+
+      signed_in_user = create(:user)
+      user_is_signed_in(user: signed_in_user)
+
+      # Start the journey which creates a journey record
+      start_journey_from_category(category: "radio-question.json")
+
+      click_on(I18n.t("generic.button.back"))
+      click_on(I18n.t("dashboard.existing.link"))
+
+      expect(page).to have_content("15 February 2021")
+      expect(page).not_to have_content("20 March 2021")
+    end
+  end
+end
diff --git a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb b/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
deleted file mode 100644
index c175e424a..000000000
--- a/spec/features/visitors/anyone_can_complete_a_journey_spec.rb
+++ /dev/null
@@ -1,316 +0,0 @@
-require "rails_helper"
-
-feature "Anyone can start a journey" do
-  around do |example|
-    ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-    ) do
-      example.run
-    end
-  end
-
-  scenario "Start page includes a call to action" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
-    )
-
-    visit root_path
-
-    click_on(I18n.t("generic.button.start"))
-
-    expect(page).to have_content("Catering")
-    expect(page).to have_content("Which service do you need?")
-    expect(page).to have_content("Not started")
-  end
-
-  scenario "an answer must be provided" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
-    )
-    journey = CreateJourney.new(category: "catering").call
-    step = journey.steps.find_by(contentful_id: "contentful-radio-question")
-
-    visit journey_step_path(journey, step)
-
-    # Omit a choice
-
-    click_on(I18n.t("generic.button.next"))
-
-    expect(page).to have_content("can't be blank")
-  end
-
-  context "when the Contentful model is of type question" do
-    context "when Contentful entry is of type short_text" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      scenario "user can answer using free text" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-short-text-question")
-
-        visit journey_step_path(journey, step)
-
-        fill_in "answer[response]", with: "email@example.com"
-        click_on(I18n.t("generic.button.next"))
-
-        click_on(step.title)
-
-        expect(find_field("answer-response-field").value).to eql("email@example.com")
-      end
-    end
-
-    context "when Contentful entry is of type long_text" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      scenario "user can answer using free text with multiple lines" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-long-text-question")
-
-        visit journey_step_path(journey, step)
-
-        fill_in "answer[response]", with: "We would like a supplier to provide catering from September 2020.\nThey must be able to supply us for 3 years minumum."
-        click_on(I18n.t("generic.button.next"))
-
-        click_on(step.title)
-
-        expect(find_field("answer-response-field").value).to eql("We would like a supplier to provide catering from September 2020.\r\nThey must be able to supply us for 3 years minumum.")
-      end
-    end
-
-    context "when Contentful entry is of type single_date" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      scenario "user can answer using a date input" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-single-date-question")
-
-        visit journey_step_path(journey, step)
-
-        fill_in "answer[response(3i)]", with: "12"
-        fill_in "answer[response(2i)]", with: "8"
-        fill_in "answer[response(1i)]", with: "2020"
-
-        click_on(I18n.t("generic.button.next"))
-
-        click_on(step.title)
-
-        expect(find_field("answer_response_3i").value).to eql("12")
-        expect(find_field("answer_response_2i").value).to eql("8")
-        expect(find_field("answer_response_1i").value).to eql("2020")
-      end
-    end
-
-    context "when Contentful entry is of type checkboxes" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      scenario "user can select multiple answers" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-checkboxes-question")
-
-        visit journey_step_path(journey, step)
-
-        check "Breakfast"
-        check "Lunch"
-
-        click_on(I18n.t("generic.button.next"))
-
-        click_on(step.title)
-
-        expect(page).to have_checked_field("answer-response-breakfast-field")
-        expect(page).to have_checked_field("answer-response-lunch-field")
-      end
-    end
-
-    context "when Contentful entry is of type radios" do
-      context "when extra configuration is passed to collect further info" do
-        around do |example|
-          ClimateControl.modify(
-            CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-          ) do
-            example.run
-          end
-        end
-
-        scenario "asks the user for further information" do
-          stub_get_contentful_entries(
-            entry_id: "contentful-starting-step",
-            fixture_filename: "closed-path-with-multiple-example.json"
-          )
-          journey = CreateJourney.new(category: "catering").call
-          step = journey.steps.find_by(contentful_id: "contentful-radio-question")
-
-          visit journey_step_path(journey, step)
-
-          click_on(I18n.t("generic.button.start"))
-
-          choose("Catering")
-          fill_in "answer[further_information]", with: "The school needs the kitchen cleaned once a day"
-
-          click_on(I18n.t("generic.button.next"))
-
-          click_on(step.title)
-
-          expect(page).to have_checked_field("Catering")
-          expect(find_field("answer-further-information-field").value)
-            .to eql("The school needs the kitchen cleaned once a day")
-        end
-      end
-    end
-  end
-
-  context "when the Contentful model is of type staticContent" do
-    context "when Contentful entry is of type paragraphs" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      scenario "user can read static content and proceed without answering" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        journey = CreateJourney.new(category: "catering").call
-        step = journey.steps.find_by(contentful_id: "contentful-starting-step")
-
-        visit journey_step_path(journey, step)
-
-        expect(page).to have_content("When you should start")
-
-        within(".static-content") do
-          paragraphs_elements = find_all("p")
-          expect(paragraphs_elements.first.text).to have_content("Procuring a new catering contract can take up to 6 months to consult, create, review and award.")
-          expect(paragraphs_elements.last.text).to have_content("Usually existing contracts start and end in the month of September. We recommend starting this process around March.")
-        end
-
-        click_on(I18n.t("generic.button.next"))
-
-        expect(page).to have_content("Catering")
-      end
-    end
-  end
-
-  context "when Contentful entry model wasn't an expected type" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-unexpected-model"
-      ) do
-        example.run
-      end
-    end
-
-    scenario "returns an error message" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-unexpected-model",
-        fixture_filename: "path-with-unexpected-model.json"
-      )
-
-      visit new_journey_path
-
-      expect(page).to have_content(I18n.t("errors.unexpected_contentful_model.page_title"))
-      expect(page).to have_content(I18n.t("errors.unexpected_contentful_model.page_body"))
-    end
-  end
-
-  context "when the Contentful Entry wasn't an expected step type" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-unexpected-step-type"
-      ) do
-        example.run
-      end
-    end
-
-    scenario "returns an error message" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-unexpected-step-type",
-        fixture_filename: "path-with-unexpected-step-type.json"
-      )
-
-      visit new_journey_path
-
-      expect(page).to have_content(I18n.t("errors.unexpected_contentful_step_type.page_title"))
-      expect(page).to have_content(I18n.t("errors.unexpected_contentful_step_type.page_body"))
-    end
-  end
-
-  context "when the starting entry id doesn't exist" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-fake-entry-id"
-      ) do
-        example.run
-      end
-    end
-
-    scenario "a Contentful entry_id does not exist" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-fake-entry-id",
-        fixture_filename: "closed-path-with-multiple-example.json"
-      )
-
-      visit new_journey_path
-
-      expect(page).to have_content(I18n.t("errors.contentful_entry_not_found.page_title"))
-      expect(page).to have_content(I18n.t("errors.contentful_entry_not_found.page_body"))
-    end
-  end
-
-  context "when the Liquid template was invalid" do
-    it "raises an error" do
-      fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-      allow_any_instance_of(FindLiquidTemplate).to receive(:file).and_return(fake_liquid_template)
-
-      visit root_path
-
-      click_on(I18n.t("generic.button.start"))
-
-      expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_title"))
-      expect(page).to have_content(I18n.t("errors.specification_template_invalid.page_body"))
-    end
-  end
-end
diff --git a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
deleted file mode 100644
index 91ae26a98..000000000
--- a/spec/features/visitors/anyone_can_download_their_catering_specification_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-feature "Users can see their catering specification" do
-  scenario "HTML" do
-    journey = create(:journey, :catering, liquid_template: stub_liquid_template)
-    step = create(:step, :long_text, long_text_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    _answer = create(:long_text_answer, step: step, response: "Red tractor")
-
-    visit journey_path(journey)
-
-    expect(page).to have_content(I18n.t("journey.specification.header"))
-
-    click_on("Download (.docx)")
-
-    expect(page.response_headers["Content-Type"]).to eql("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
-    header = page.response_headers["Content-Disposition"]
-    expect(header).to match(/^attachment/)
-    expect(header).to match(/filename="specification.docx"/)
-  end
-
-  def stub_liquid_template
-    fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/food_catering.liquid")
-
-    finder = instance_double(FindLiquidTemplate)
-    allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-      .and_return(finder)
-    allow(finder).to receive(:call).and_return(fake_liquid_template)
-
-    fake_liquid_template
-  end
-end
diff --git a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb b/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
deleted file mode 100644
index 73b8b0ede..000000000
--- a/spec/features/visitors/anyone_can_edit_their_answers_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require "rails_helper"
-
-feature "Users can edit their answers" do
-  let(:answer) { create(:short_text_answer, response: "answer") }
-
-  context "when the question is short_text" do
-    let(:answer) { create(:short_text_answer, response: "answer") }
-
-    scenario "The edited answer is saved" do
-      visit journey_path(answer.step.journey)
-
-      click_on(answer.step.title)
-
-      fill_in "answer[response]", with: "email@example.com"
-
-      click_on(I18n.t("generic.button.update"))
-
-      click_on(answer.step.title)
-
-      expect(find_field("answer-response-field").value).to eql("email@example.com")
-    end
-  end
-
-  context "when the question is single_date" do
-    let(:answer) { create(:single_date_answer, response: 1.year.ago) }
-
-    scenario "The edited answer is saved" do
-      visit journey_path(answer.step.journey)
-
-      click_on(answer.step.title)
-
-      fill_in "answer[response(3i)]", with: "12"
-      fill_in "answer[response(2i)]", with: "8"
-      fill_in "answer[response(1i)]", with: "2020"
-
-      click_on(I18n.t("generic.button.update"))
-
-      click_on(answer.step.title)
-
-      expect(find_field("answer_response_3i").value).to eql("12")
-      expect(find_field("answer_response_2i").value).to eql("8")
-      expect(find_field("answer_response_1i").value).to eql("2020")
-    end
-  end
-
-  context "when the question is checkbox_answers" do
-    let(:answer) { create(:checkbox_answers, response: ["breakfast", "lunch", ""]) }
-
-    scenario "The edited answer is saved" do
-      visit journey_path(answer.step.journey)
-
-      click_on(answer.step.title)
-
-      uncheck "Breakfast"
-
-      click_on(I18n.t("generic.button.update"))
-
-      click_on(answer.step.title)
-
-      expect(page).not_to have_checked_field("answer-response-breakfast-field")
-      expect(page).to have_checked_field("answer-response-lunch-field")
-    end
-  end
-
-  context "An error is thrown" do
-    scenario "When an answer is invalid" do
-      visit journey_path(answer.step.journey)
-
-      click_on(answer.step.title)
-
-      fill_in "answer[response]", with: ""
-
-      click_on(I18n.t("generic.button.update"))
-
-      expect(page).to have_content("can't be blank")
-    end
-  end
-end
diff --git a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb b/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
deleted file mode 100644
index 31203aa32..000000000
--- a/spec/features/visitors/anyone_can_see_a_planning_start_page_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "rails_helper"
-
-feature "Users can see a start page for planning their purchase" do
-  scenario "Start page content is shown on the root path" do
-    visit root_path
-
-    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
-
-    expect(page).to have_content(I18n.t("planning.start_page.overview_title"))
-    I18n.t("planning.start_page.overview_body").each do |paragraph|
-      expect(page).to have_content(paragraph)
-    end
-
-    expect(page).to have_content(I18n.t("planning.start_page.before_you_start_list_title"))
-    I18n.t("planning.start_page.before_you_start_list_items").each do |list_item|
-      expect(page).to have_content(list_item)
-    end
-    expect(page).to have_content(I18n.t("planning.start_page.before_you_start_body"))
-  end
-end
diff --git a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb b/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
deleted file mode 100644
index cfde7b168..000000000
--- a/spec/features/visitors/anyone_can_see_the_map_of_journey_steps_page_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-feature "Users can see all the steps of a journey" do
-  around do |example|
-    ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-    ) do
-      example.run
-    end
-  end
-
-  scenario "Multiple journey steps" do
-    stub_get_contentful_entries(
-      entry_id: "contentful-starting-step",
-      fixture_filename: "closed-path-with-multiple-example.json"
-    )
-
-    visit new_journey_map_path
-
-    expect(page).to have_content(I18n.t("journey_map.page_title"))
-
-    within(".govuk-list") do
-      list_items = find_all("li")
-      within(list_items.first) do
-        expect(page).to have_link("When you should start", href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-starting-step")
-      end
-      within(list_items.last) do
-        expect(page).to have_link("Everyday services that are required and need to be considered", href: "https://app.contentful.com/spaces/#{ENV["CONTENTFUL_SPACE"]}/environments/#{ENV["CONTENTFUL_ENVIRONMENT"]}/entries/contentful-checkboxes-question")
-      end
-    end
-  end
-
-  context "when the map isn't valid" do
-    context "when the same entry is found twice" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "returns an error message" do
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
-        )
-
-        visit new_journey_map_path
-
-        expect(page).to have_content(I18n.t("errors.repeat_step_in_the_contentful_journey.page_title"))
-        expect(page).to have_content(
-          I18n.t("errors.repeat_step_in_the_contentful_journey.page_body", entry_id: "contentful-starting-step")
-        )
-      end
-    end
-
-    context "when the chain becomes obviously too long" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "returns an error message" do
-        stub_const("BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH", 1)
-        stub_get_contentful_entries(
-          entry_id: "contentful-radio-question",
-          fixture_filename: "closed-path-with-multiple-example.json"
-        )
-
-        visit new_journey_map_path
-
-        expect(page).to have_content(I18n.t("errors.too_many_steps_in_the_contentful_journey.page_title"))
-        expect(page).to have_content(
-          I18n.t("errors.too_many_steps_in_the_contentful_journey.page_body", entry_id: "contentful-radio-question", step_count: 1)
-        )
-      end
-    end
-  end
-end
diff --git a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb b/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
deleted file mode 100644
index b0ec0e1ee..000000000
--- a/spec/features/visitors/anyone_can_see_their_catering_specification_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-feature "Users can see their catering specification" do
-  scenario "HTML" do
-    liquid_template = stub_liquid_template(filename: "food_catering.liquid")
-    journey = create(:journey, :catering, liquid_template: liquid_template)
-    step = create(:step, :long_text, long_text_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    answer = create(:long_text_answer, step: step, response: "Red tractor")
-
-    visit journey_path(journey)
-
-    expect(page).to have_content(I18n.t("journey.specification.header"))
-
-    within("article#specification") do
-      expect(page).to have_content("Menus and ordering")
-      expect(page).to have_content("Food standards")
-      expect(page).to have_content("The school also requires the service to comply with the following non-mandatory food standards or schemes:")
-      expect(page).to have_content(answer.response)
-    end
-  end
-
-  scenario "renders responses that need extra formatting" do
-    liquid_template = stub_liquid_template(filename: "food_catering.liquid")
-    journey = create(:journey, :catering, liquid_template: liquid_template)
-    step = create(:step, :radio, radio_answer: nil, journey: journey, contentful_id: "NxJWpbiFeEAmvcw17EysX")
-    _answer = create(:radio_answer, step: step, response: "Red tractor", further_information: "Lots more detail")
-
-    visit journey_path(journey)
-
-    expect(page).to have_content(I18n.t("journey.specification.header"))
-
-    within("article#specification") do
-      expect(page).to have_content("Red tractor - Lots more detail")
-    end
-  end
-end
diff --git a/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
new file mode 100644
index 000000000..92f7f8f6f
--- /dev/null
+++ b/spec/features/visitors/anyone_can_sign_in_with_dfe_sign_in_spec.rb
@@ -0,0 +1,67 @@
+require "rails_helper"
+
+feature "Anyone can sign in with DfE Sign-in" do
+  context "when the user exists in the service" do
+    scenario "signs in successfully" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+      user = create(:user)
+
+      user_exists_in_dfe_sign_in(dsi_uid: user.dfe_sign_in_uid)
+      user_starts_the_journey
+
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+      within("header") do
+        expect(page).to have_content(I18n.t("generic.button.sign_out"))
+      end
+    end
+
+    scenario "can move between pages without reauthenticating by relying on session data" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+      user = create(:user)
+
+      user_exists_in_dfe_sign_in(dsi_uid: user.dfe_sign_in_uid)
+      user_starts_the_journey
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+      # Undo the OmniAuth stub to check we don't require it again
+      OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(foo: :bar)
+
+      journey = create(:journey, user: user)
+      step = create(:step, :radio, journey: journey)
+      visit journey_step_path(journey, step)
+      expect(page).to have_content(step.title)
+    end
+  end
+
+  context "when the user doesn't exist in the service" do
+    scenario "new users can sign in" do
+      stub_contentful_category(fixture_filename: "radio-question.json")
+
+      a_dsi_uid_we_have_not_seen_before = "7f2cbd01-6779-4524-acc4-0c6ef52120b5"
+
+      # Omit the creation of a fake user to simulate a user not found scenario
+
+      user_exists_in_dfe_sign_in(dsi_uid: a_dsi_uid_we_have_not_seen_before)
+      user_starts_the_journey
+
+      expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+      new_user = User.find_by(dfe_sign_in_uid: a_dsi_uid_we_have_not_seen_before)
+      expect(new_user.dfe_sign_in_uid).to eql(a_dsi_uid_we_have_not_seen_before)
+    end
+  end
+
+  scenario "sign in fails" do
+    user_sign_in_attempt_fails
+
+    expect(Rollbar).to receive(:error)
+      .with("Sign in failed unexpectedly")
+      .and_call_original
+
+    visit root_path
+    click_button I18n.t("generic.button.start")
+
+    expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_title"))
+    expect(page).to have_content(I18n.t("errors.sign_in.unexpected_failure.page_body"))
+  end
+end
diff --git a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb b/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
deleted file mode 100644
index 908283b28..000000000
--- a/spec/features/visitors/anyone_can_view_a_list_of_tasks_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "rails_helper"
-
-feature "Users can view the task list" do
-  context "When a question has been answered" do
-    let(:answer) { create(:short_text_answer, response: "answer") }
-
-    scenario "The task is marked as completed" do
-      visit journey_path(answer.step.journey)
-
-      expect(page).to have_content(I18n.t("task_list.status.completed"))
-    end
-  end
-end
diff --git a/spec/features/visitors/anyone_navigate_back_to_home_page_spec.rb b/spec/features/visitors/navigate_back_to_home_page_spec.rb
similarity index 100%
rename from spec/features/visitors/anyone_navigate_back_to_home_page_spec.rb
rename to spec/features/visitors/navigate_back_to_home_page_spec.rb
diff --git a/spec/features/visitors/see_a_planning_start_page_spec.rb b/spec/features/visitors/see_a_planning_start_page_spec.rb
new file mode 100644
index 000000000..c9fb749f4
--- /dev/null
+++ b/spec/features/visitors/see_a_planning_start_page_spec.rb
@@ -0,0 +1,57 @@
+require "rails_helper"
+
+feature "Users can see a start page for planning their purchase" do
+  scenario "Start page content is shown on the root path" do
+    visit root_path
+
+    click_on("procuring a new catering service for a school")
+
+    expect(page).to have_content("Catering services")
+    expect(page).to have_content("How to procure a catering contract for your school.")
+
+    expect(page).to have_content("Before you start")
+    page.find(:xpath, "//*[contains(text(),'Before you start')]").click
+    expect(page).to have_content("A catering contract typically takes between 3 to 6 months to complete.")
+
+    expect(page).to have_content("Ways to procure a catering contract")
+    page.find(:xpath, "//*[contains(text(),'Ways to procure a catering contract')]").click
+    expect(page).to have_content("A catering contract is a high value procurement. We generally say high is over 40,000.")
+
+    expect(page).to have_content("Rules, regulations and requirements")
+    page.find(:xpath, "//*[contains(text(),'Rules, regulations and requirements')]").click
+    expect(page).to have_content("You'll need to be aware of some of the rules, regulations and requirements that can apply to a catering contract.")
+
+    expect(page).to have_content("In-house catering")
+    page.find(:xpath, "//*[contains(text(),'In-house catering')]").click
+    expect(page).to have_content("Running the service in-house is another option. You may want to consider whether this is right for your school before you procure a contract. There are benefits and challenges to running the service yourself.")
+
+    expect(page).to have_content("Starting a procurement process")
+    page.find(:xpath, "//*[contains(text(),'Starting a procurement process')]").click
+    expect(page).to have_content("Who to involve")
+
+    expect(page).to have_content("Writing your requirements")
+    page.find(:xpath, "//*[contains(text(),'Writing your requirements')]").click
+    expect(page).to have_content("This is the document that you give to suppliers explaining what you want to buy, sometimes called a specification.")
+    expect(page).to have_link("use our tool to create a specification", href: root_path)
+
+    expect(page).to have_content("What to do next")
+    page.find(:xpath, "//*[contains(text(),'What to do next')]").click
+    expect(page).to have_content("Once you have your specification, you will need to decide if you will be using the open or restricted procedure.")
+
+    expect(page).to have_content("Where to get help")
+    expect(page).to have_content("See where to get help with buying for schools if you need it.")
+    expect(page).to have_link("get help with buying for schools", href: "https://www.gov.uk/guidance/buying-for-schools/get-help-with-buying-for-schools")
+  end
+
+  scenario "can navigate back to the home page" do
+    visit root_path
+
+    click_on("procuring a new catering service for a school")
+
+    expect(page).to have_content(I18n.t("planning.start_page.page_title"))
+
+    click_on(I18n.t("generic.button.back"))
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+  end
+end
diff --git a/spec/features/visitors/see_a_specification_start_page_spec.rb b/spec/features/visitors/see_a_specification_start_page_spec.rb
new file mode 100644
index 000000000..ee376c475
--- /dev/null
+++ b/spec/features/visitors/see_a_specification_start_page_spec.rb
@@ -0,0 +1,46 @@
+require "rails_helper"
+
+feature "Users can see a start page for specifying their purchase" do
+  scenario "Start page content is shown on the root path" do
+    visit root_path
+
+    expect(page).to have_content(I18n.t("specifying.start_page.page_title"))
+
+    I18n.t("specifying.start_page.overview_body").each do |paragraph|
+      expect(page).to have_content(paragraph)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_title"))
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_body"))
+
+    expect(page).to have_content("are responsible for procuring a new catering service for a school")
+    expect(page).to have_link("procuring a new catering service", href: "/planning")
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_list")[1])
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_can_use_list")[2])
+
+    expect(page).to have_content(I18n.t("specifying.start_page.who_for_cannot_use_body"))
+    I18n.t("specifying.start_page.who_for_cannot_use_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_title"))
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_document_body"))
+    I18n.t("specifying.start_page.how_service_works_document_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+    expect(page).to have_content(I18n.t("specifying.start_page.how_service_works_themes_body"))
+    I18n.t("specifying.start_page.how_service_works_themes_list").each do |list_item|
+      expect(page).to have_content(list_item)
+    end
+
+    expect(page).to have_content(I18n.t("specifying.start_page.pause_and_resume_body"))
+  end
+
+  scenario "The start button takes the user to the dashboard" do
+    visit root_path
+
+    click_on(I18n.t("generic.button.start"))
+
+    expect(page).to have_content(I18n.t("dashboard.header"))
+  end
+end
diff --git a/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
new file mode 100644
index 000000000..f37b3a8ed
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-dynamic-liquid-template.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'>\n  <section>\n    <h2>Menus and ordering</h2>\n    <h3>Food standards</h2>\n    <ol>\n      {% if answer_radio-question %}\n        <li>\n          <p class='govuk-body'>The school also requires the service to comply with the following non-mandatory food standards or schemes:</p>\n          <p class='govuk-body'>{{answer_radio-question}}</p>\n        </li>\n      {% endif %}\n    </ol>\n  </section>\n</artcile>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
new file mode 100644
index 000000000..355232e65
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-invalid-liquid-template.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [],
+        "specification_template": "<h1>{{{invalid Liquid%}}}</h1>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/category-with-liquid-template.json b/spec/fixtures/contentful/categories/category-with-liquid-template.json
new file mode 100644
index 000000000..b9bd3872c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-liquid-template.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/category-with-no-steps.json b/spec/fixtures/contentful/categories/category-with-no-steps.json
new file mode 100644
index 000000000..d1267d882
--- /dev/null
+++ b/spec/fixtures/contentful/categories/category-with-no-steps.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/checkboxes-question.json b/spec/fixtures/contentful/categories/checkboxes-question.json
new file mode 100644
index 000000000..3e50e9fb0
--- /dev/null
+++ b/spec/fixtures/contentful/categories/checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/currency-question.json b/spec/fixtures/contentful/categories/currency-question.json
new file mode 100644
index 000000000..68d2e80b0
--- /dev/null
+++ b/spec/fixtures/contentful/categories/currency-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Currency",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "currency-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/extended-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
new file mode 100644
index 000000000..a96872ddf
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1><ul>{% for checkbox_answer in answer_extended-checkboxes-question['selected_answers'] %}<li>{{ checkbox_answer['human_value'] }}</li><li>{{ checkbox_answer.further_information }}</li>{% endfor %}</ul></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json b/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json
new file mode 100644
index 000000000..43d81a8ec
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-long-answer-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-long-answer-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json b/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json
new file mode 100644
index 000000000..26317406c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-long-answer-radio-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-long-answer-radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/extended-radio-question.json b/spec/fixtures/contentful/categories/extended-radio-question.json
new file mode 100644
index 000000000..7d7c676d2
--- /dev/null
+++ b/spec/fixtures/contentful/categories/extended-radio-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "extended-radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_extended-radio-question}}</h1><ul>{% for extended_answer in extended_answer_extended-radio-question %}<li>{{ extended_answer['response'] }}</li><li>{{ extended_answer['further_information'] }}</li>{% endfor %}</ul></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/hidden-field.json b/spec/fixtures/contentful/categories/hidden-field.json
new file mode 100644
index 000000000..4ded472a5
--- /dev/null
+++ b/spec/fixtures/contentful/categories/hidden-field.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "hidden-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_hidden-field}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/journey-with-multiple-entries.json b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
new file mode 100644
index 000000000..ac51a486c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/journey-with-multiple-entries.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "journey-with-multiple-entries-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/journey-with-repeat-entries.json b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
new file mode 100644
index 000000000..abcdb2f89
--- /dev/null
+++ b/spec/fixtures/contentful/categories/journey-with-repeat-entries.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "journey-with-repeat-entries-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/long-text-question.json b/spec/fixtures/contentful/categories/long-text-question.json
new file mode 100644
index 000000000..0791bddf1
--- /dev/null
+++ b/spec/fixtures/contentful/categories/long-text-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/markdown-help-text.json b/spec/fixtures/contentful/categories/markdown-help-text.json
new file mode 100644
index 000000000..142182217
--- /dev/null
+++ b/spec/fixtures/contentful/categories/markdown-help-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "markdown-help-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/missing-entry-id.json b/spec/fixtures/contentful/categories/missing-entry-id.json
new file mode 100644
index 000000000..d1267d882
--- /dev/null
+++ b/spec/fixtures/contentful/categories/missing-entry-id.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/multiple-sections-and-steps.json b/spec/fixtures/contentful/categories/multiple-sections-and-steps.json
new file mode 100644
index 000000000..98e670941
--- /dev/null
+++ b/spec/fixtures/contentful/categories/multiple-sections-and-steps.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "multiple-radio-section"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "multiple-long-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/multiple-sections.json b/spec/fixtures/contentful/categories/multiple-sections.json
new file mode 100644
index 000000000..85fd97373
--- /dev/null
+++ b/spec/fixtures/contentful/categories/multiple-sections.json
@@ -0,0 +1,51 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          },
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "long-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/nil-help-text-radios.json b/spec/fixtures/contentful/categories/nil-help-text-radios.json
new file mode 100644
index 000000000..19ce6ebbf
--- /dev/null
+++ b/spec/fixtures/contentful/categories/nil-help-text-radios.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "nil-help-text-radios-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/nil-help-text-short-text.json b/spec/fixtures/contentful/categories/nil-help-text-short-text.json
new file mode 100644
index 000000000..9d69928b2
--- /dev/null
+++ b/spec/fixtures/contentful/categories/nil-help-text-short-text.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "nil-help-text-short-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/number-question.json b/spec/fixtures/contentful/categories/number-question.json
new file mode 100644
index 000000000..6fb8b6c8b
--- /dev/null
+++ b/spec/fixtures/contentful/categories/number-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Number",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "number-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/radio-question-with-separator.json b/spec/fixtures/contentful/categories/radio-question-with-separator.json
new file mode 100644
index 000000000..182428791
--- /dev/null
+++ b/spec/fixtures/contentful/categories/radio-question-with-separator.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-with-separator-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/radio-question.json b/spec/fixtures/contentful/categories/radio-question.json
new file mode 100644
index 000000000..b9bd3872c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/radio-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "radio-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/short-text-question.json b/spec/fixtures/contentful/categories/short-text-question.json
new file mode 100644
index 000000000..a1733707d
--- /dev/null
+++ b/spec/fixtures/contentful/categories/short-text-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "short-text-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/show-one-additional-question.json b/spec/fixtures/contentful/categories/show-one-additional-question.json
new file mode 100644
index 000000000..464032c73
--- /dev/null
+++ b/spec/fixtures/contentful/categories/show-one-additional-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "show-one-additional-question-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>{{answer_hidden-field}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/single-date-question.json b/spec/fixtures/contentful/categories/single-date-question.json
new file mode 100644
index 000000000..6aa53af6f
--- /dev/null
+++ b/spec/fixtures/contentful/categories/single-date-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "single-date-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/skippable-checkboxes-question.json b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
new file mode 100644
index 000000000..e6ff784a2
--- /dev/null
+++ b/spec/fixtures/contentful/categories/skippable-checkboxes-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "skippable-checkboxes-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1>{% if answer_skippable-checkboxes-question['skipped'] == true %}Skipped question detected{% endif %}</article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/static-content.json b/spec/fixtures/contentful/categories/static-content.json
new file mode 100644
index 000000000..6b65f352c
--- /dev/null
+++ b/spec/fixtures/contentful/categories/static-content.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "static-content-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
new file mode 100644
index 000000000..7bf54b054
--- /dev/null
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-question-type.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-question-type-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/categories/unexpected-contentful-type.json b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
new file mode 100644
index 000000000..3ae97150e
--- /dev/null
+++ b/spec/fixtures/contentful/categories/unexpected-contentful-type.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "contentful-category-entry",
+        "type": "Entry",
+        "createdAt": "2021-01-20T12:19:10.220Z",
+        "updatedAt": "2021-01-20T15:06:12.067Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "category"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Catering",
+        "sections": [
+          {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "unexpected-contentful-type-section"
+            }
+          }
+        ],
+        "specification_template": "<article id='specification'><h1>Liquid {{templating}}</h1></article>"
+    }
+}
diff --git a/spec/fixtures/contentful/closed-path-with-multiple-example.json b/spec/fixtures/contentful/closed-path-with-multiple-example.json
deleted file mode 100644
index c2ea024e6..000000000
--- a/spec/fixtures/contentful/closed-path-with-multiple-example.json
+++ /dev/null
@@ -1,286 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-radio-question"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-radio-question",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering",
-                      "display_further_information": true,
-                      "further_information_help_text": "Do a thing"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ],
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-short-text-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-short-text-question",
-                "type": "Entry",
-                "createdAt": "2020-11-05T16:42:58.340Z",
-                "updatedAt": "2020-11-05T16:42:58.340Z",
-                "environment": {
-                    "sys": {
-                        "id": "master",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/what-email-address-did-you-use",
-                "title": "What email address did you use?",
-                "helpText": "This will help us recover your existing plans",
-                "type": "short text",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-long-text-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-long-text-question",
-                "type": "Entry",
-                "createdAt": "2020-11-11T11:26:20.994Z",
-                "updatedAt": "2020-11-11T11:26:20.994Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/describe-what-you-need",
-                "title": "Describe what you need",
-                "helpText": "Briefly describe what you are looking to procure from your supplier.",
-                "type": "long text",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-single-date-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-single-date-question",
-                "type": "Entry",
-                "createdAt": "2020-12-08T10:43:19.102Z",
-                "updatedAt": "2020-12-08T10:43:19.102Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/starting-date",
-                "type": "single date",
-                "title": "When will this start?",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-checkboxes-question"
-                    }
-                  }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-checkboxes-question",
-                "type": "Entry",
-                "createdAt": "2020-12-09T11:53:52.744Z",
-                "updatedAt": "2020-12-09T11:53:52.744Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/everyday-services",
-                "type": "checkboxes",
-                "title": "Everyday services that are required and need to be considered",
-                "extendedOptions": [
-                  {
-                      "value": "breakfast"
-                  },
-                  {
-                      "value": "lunch"
-                  },
-                  {
-                      "value": "dinner"
-                  }
-                ]
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/multiple-entries-example.json b/spec/fixtures/contentful/multiple-entries-example.json
deleted file mode 100644
index 4ad585640..000000000
--- a/spec/fixtures/contentful/multiple-entries-example.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "hfjJgWRg4xiiiImwVRDtZ",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ]
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/path-with-unexpected-model.json b/spec/fixtures/contentful/path-with-unexpected-model.json
deleted file mode 100644
index 4701e030f..000000000
--- a/spec/fixtures/contentful/path-with-unexpected-model.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "jspwts36h1os"
-                    }
-                },
-                "id": "contentful-unexpected-model",
-                "type": "Entry",
-                "createdAt": "2020-09-02T15:56:05.472Z",
-                "updatedAt": "2020-09-02T16:19:00.652Z",
-                "environment": {
-                    "sys": {
-                        "id": "master",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 2,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "unmanagedPage"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/check-your-answers",
-                "type": "radios"
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/path-with-unexpected-step-type.json b/spec/fixtures/contentful/path-with-unexpected-step-type.json
deleted file mode 100644
index d1f353021..000000000
--- a/spec/fixtures/contentful/path-with-unexpected-step-type.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 2,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-      {
-          "sys": {
-              "space": {
-                  "sys": {
-                      "type": "Link",
-                      "linkType": "Space",
-                      "id": "jspwts36h1os"
-                  }
-              },
-              "id": "contentful-unexpected-step-type",
-              "type": "Entry",
-              "createdAt": "2020-09-02T15:56:05.472Z",
-              "updatedAt": "2020-09-02T16:19:00.652Z",
-              "environment": {
-                  "sys": {
-                      "id": "master",
-                      "type": "Link",
-                      "linkType": "Environment"
-                  }
-              },
-              "revision": 2,
-              "contentType": {
-                  "sys": {
-                      "type": "Link",
-                      "linkType": "ContentType",
-                      "id": "question"
-                  }
-              },
-              "locale": "en-US"
-          },
-          "fields": {
-              "slug": "/check-your-answers",
-              "type": "telepathy"
-          }
-      }
-    ]
-}
diff --git a/spec/fixtures/contentful/repeat-entry-example.json b/spec/fixtures/contentful/repeat-entry-example.json
deleted file mode 100644
index 00bdd448f..000000000
--- a/spec/fixtures/contentful/repeat-entry-example.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "sys": {
-        "type": "Array"
-    },
-    "total": 4,
-    "skip": 0,
-    "limit": 100,
-    "items": [
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "hfjJgWRg4xiiiImwVRDtZ",
-                "type": "Entry",
-                "createdAt": "2020-11-04T12:28:30.442Z",
-                "updatedAt": "2020-11-26T16:39:54.188Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 6,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "question"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/dev-start-which-service",
-                "title": "Which service do you need?",
-                "helpText": "Tell us which service you need.",
-                "type": "radios",
-                "extendedOptions": [
-                  {
-                      "value": "Catering"
-                  },
-                  {
-                      "value": "Cleaning"
-                  }
-                ],
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "contentful-starting-step"
-                    }
-                }
-            }
-        },
-        {
-            "sys": {
-                "space": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Space",
-                        "id": "rwl7tyzv9sys"
-                    }
-                },
-                "id": "contentful-starting-step",
-                "type": "Entry",
-                "createdAt": "2020-12-02T10:48:35.748Z",
-                "updatedAt": "2020-12-02T10:48:35.748Z",
-                "environment": {
-                    "sys": {
-                        "id": "develop",
-                        "type": "Link",
-                        "linkType": "Environment"
-                    }
-                },
-                "revision": 1,
-                "contentType": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "ContentType",
-                        "id": "staticContent"
-                    }
-                },
-                "locale": "en-US"
-            },
-            "fields": {
-                "slug": "/timelines",
-                "title": "When you should start",
-                "body": "Procuring a new catering contract can take up to 6 months to consult, create, review and award. \n\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.",
-                "type": "paragraphs",
-                "next": {
-                    "sys": {
-                        "type": "Link",
-                        "linkType": "Entry",
-                        "id": "hfjJgWRg4xiiiImwVRDtZ"
-                    }
-                }
-            }
-        }
-    ]
-}
diff --git a/spec/fixtures/contentful/sections/checkboxes-section.json b/spec/fixtures/contentful/sections/checkboxes-section.json
new file mode 100644
index 000000000..e2668ad17
--- /dev/null
+++ b/spec/fixtures/contentful/sections/checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/currency-section.json b/spec/fixtures/contentful/sections/currency-section.json
new file mode 100644
index 000000000..e73ea86f0
--- /dev/null
+++ b/spec/fixtures/contentful/sections/currency-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "currency-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "currency-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-checkboxes-section.json b/spec/fixtures/contentful/sections/extended-checkboxes-section.json
new file mode 100644
index 000000000..d3f612812
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json b/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json
new file mode 100644
index 000000000..e364a8487
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-long-answer-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-long-answer-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json b/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json
new file mode 100644
index 000000000..08f4d4555
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-long-answer-radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-long-answer-radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/extended-radio-section.json b/spec/fixtures/contentful/sections/extended-radio-section.json
new file mode 100644
index 000000000..0547e9fe3
--- /dev/null
+++ b/spec/fixtures/contentful/sections/extended-radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "extended-radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/hidden-section.json b/spec/fixtures/contentful/sections/hidden-section.json
new file mode 100644
index 000000000..e6776e1b4
--- /dev/null
+++ b/spec/fixtures/contentful/sections/hidden-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "hidden-field"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "shown-field"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json b/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json
new file mode 100644
index 000000000..63a6a0612
--- /dev/null
+++ b/spec/fixtures/contentful/sections/journey-with-multiple-entries-section.json
@@ -0,0 +1,57 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "journey-with-multiple-entries-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json b/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json
new file mode 100644
index 000000000..14b9ea73e
--- /dev/null
+++ b/spec/fixtures/contentful/sections/journey-with-repeat-entries-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "journey-with-repeat-entries-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/long-text-section.json b/spec/fixtures/contentful/sections/long-text-section.json
new file mode 100644
index 000000000..3ad55bccd
--- /dev/null
+++ b/spec/fixtures/contentful/sections/long-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section B",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/markdown-help-text-section.json b/spec/fixtures/contentful/sections/markdown-help-text-section.json
new file mode 100644
index 000000000..77e5cbf13
--- /dev/null
+++ b/spec/fixtures/contentful/sections/markdown-help-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "markdown-help-text"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/multiple-long-text-section.json b/spec/fixtures/contentful/sections/multiple-long-text-section.json
new file mode 100644
index 000000000..49ddfd5b6
--- /dev/null
+++ b/spec/fixtures/contentful/sections/multiple-long-text-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section B",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "long-text-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/multiple-radio-section.json b/spec/fixtures/contentful/sections/multiple-radio-section.json
new file mode 100644
index 000000000..ecad2304a
--- /dev/null
+++ b/spec/fixtures/contentful/sections/multiple-radio-section.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "radio-question"
+              }
+            },
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "single-date-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/nil-help-text-radios-section.json b/spec/fixtures/contentful/sections/nil-help-text-radios-section.json
new file mode 100644
index 000000000..6ed3d42eb
--- /dev/null
+++ b/spec/fixtures/contentful/sections/nil-help-text-radios-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "nil-help-text-radios"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json b/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json
new file mode 100644
index 000000000..a2b62bb78
--- /dev/null
+++ b/spec/fixtures/contentful/sections/nil-help-text-short-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-short-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "nil-help-text-short-text"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/number-section.json b/spec/fixtures/contentful/sections/number-section.json
new file mode 100644
index 000000000..ddba3ea4a
--- /dev/null
+++ b/spec/fixtures/contentful/sections/number-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "number-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/radio-section.json b/spec/fixtures/contentful/sections/radio-section.json
new file mode 100644
index 000000000..027cbf571
--- /dev/null
+++ b/spec/fixtures/contentful/sections/radio-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "radio-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/radio-with-separator-section.json b/spec/fixtures/contentful/sections/radio-with-separator-section.json
new file mode 100644
index 000000000..216461309
--- /dev/null
+++ b/spec/fixtures/contentful/sections/radio-with-separator-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "radio-with-separator-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "radio-with-separator-question"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/short-text-section.json b/spec/fixtures/contentful/sections/short-text-section.json
new file mode 100644
index 000000000..a64641194
--- /dev/null
+++ b/spec/fixtures/contentful/sections/short-text-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "short-text-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "short-text-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/show-one-additional-question-section.json b/spec/fixtures/contentful/sections/show-one-additional-question-section.json
new file mode 100644
index 000000000..e907521ad
--- /dev/null
+++ b/spec/fixtures/contentful/sections/show-one-additional-question-section.json
@@ -0,0 +1,57 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "show-one-additional-question"
+                }
+            },
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "hidden-field-that-shows-an-additional-question"
+                }
+            },
+            {
+                "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "hidden-field"
+                }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/single-date-section.json b/spec/fixtures/contentful/sections/single-date-section.json
new file mode 100644
index 000000000..8cd9ef8a9
--- /dev/null
+++ b/spec/fixtures/contentful/sections/single-date-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "single-date-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "single-date-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/skippable-checkboxes-section.json b/spec/fixtures/contentful/sections/skippable-checkboxes-section.json
new file mode 100644
index 000000000..27cb9fb5f
--- /dev/null
+++ b/spec/fixtures/contentful/sections/skippable-checkboxes-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "skippable-checkboxes-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "skippable-checkboxes-question"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/static-content-section.json b/spec/fixtures/contentful/sections/static-content-section.json
new file mode 100644
index 000000000..c340bc3f7
--- /dev/null
+++ b/spec/fixtures/contentful/sections/static-content-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "static-content-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "static-content"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json b/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json
new file mode 100644
index 000000000..bdec0acc9
--- /dev/null
+++ b/spec/fixtures/contentful/sections/unexpected-contentful-question-type-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "unexpected-contentful-question-type-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "unexpected-contentful-question-type"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json b/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json
new file mode 100644
index 000000000..9cd4e6b19
--- /dev/null
+++ b/spec/fixtures/contentful/sections/unexpected-contentful-type-section.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "unexpected-contentful-type-section",
+        "type": "Entry",
+        "createdAt": "2021-02-01T10:47:10.257Z",
+        "updatedAt": "2021-02-01T10:47:10.257Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "section"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "title": "Section A",
+        "steps": [
+            {
+              "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "unexpected-contentful-type"
+              }
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/checkbox-example.json b/spec/fixtures/contentful/steps/checkboxes-question.json
similarity index 84%
rename from spec/fixtures/contentful/checkbox-example.json
rename to spec/fixtures/contentful/steps/checkboxes-question.json
index 71408ac83..e90859e22 100644
--- a/spec/fixtures/contentful/checkbox-example.json
+++ b/spec/fixtures/contentful/steps/checkboxes-question.json
@@ -7,7 +7,7 @@
                 "id": "rwl7tyzv9sys"
             }
         },
-        "id": "1DqhwF2XkJJ0Um6NSweWlZ",
+        "id": "checkboxes-question",
         "type": "Entry",
         "createdAt": "2020-12-09T11:53:52.744Z",
         "updatedAt": "2020-12-09T11:53:52.744Z",
@@ -33,9 +33,10 @@
         "type": "checkboxes",
         "title": "Everyday services that are required and need to be considered",
         "extendedOptions": [
-          { "value": "breakfast" },
-          { "value": "lunch" },
-          { "value": "dinner" }
+          { "value": "Breakfast" },
+          { "value": "Morning break" },
+          { "value": "Lunch" },
+          { "value": "Dinner" }
         ]
     }
 }
diff --git a/spec/fixtures/contentful/steps/currency-question.json b/spec/fixtures/contentful/steps/currency-question.json
new file mode 100644
index 000000000..1738f056a
--- /dev/null
+++ b/spec/fixtures/contentful/steps/currency-question.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "currency-question",
+        "type": "Currency",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/what-funds-does-the-school-have-available-for-the-maintenance-or-replacement-of-heavy-equipment-in-the-coming-year",
+        "title": "What funds does the school have available for the maintenance or replacement of heavy equipment in the coming year?",
+        "helpText": "Give an estimate of the funds available.",
+        "type": "currency"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
new file mode 100644
index 000000000..00cf863e1
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-checkboxes-question.json
@@ -0,0 +1,53 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2021-02-17T14:09:56.405Z",
+        "updatedAt": "2021-02-17T14:38:07.806Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/extended-checkboxes",
+        "type": "checkboxes",
+        "title": "Extended checkboxes",
+        "extendedOptions": [
+            {
+                "value": "Yes",
+                "display_further_information": true,
+                "further_information_help_text": "You should tell us more"
+            },
+            {
+                "value": "No",
+                "display_further_information": true
+            },
+            {
+                "value": "Other, please specify",
+                "further_information_help_text": "Tell us all about it",
+                "display_further_information": true
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}
diff --git a/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json b/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json
new file mode 100644
index 000000000..44d4b3635
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-long-answer-checkboxes-question.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "extended-long-answer-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2021-02-17T14:09:56.405Z",
+        "updatedAt": "2021-02-17T14:38:07.806Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 2,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/extended-checkboxes",
+        "type": "checkboxes",
+        "title": "Extended checkboxes",
+        "extendedOptions": [
+            {
+                "value": "Yes",
+                "display_further_information": "long",
+                "further_information_help_text": "You should tell us more"
+            },
+            {
+                "value": "No",
+                "display_further_information": "long",
+                "further_information_help_text": "You should tell us more"
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}
diff --git a/spec/fixtures/contentful/extended-radio-question-example.json b/spec/fixtures/contentful/steps/extended-long-answer-radio-question.json
similarity index 92%
rename from spec/fixtures/contentful/extended-radio-question-example.json
rename to spec/fixtures/contentful/steps/extended-long-answer-radio-question.json
index fd02a3b48..0e5839d4a 100644
--- a/spec/fixtures/contentful/extended-radio-question-example.json
+++ b/spec/fixtures/contentful/steps/extended-long-answer-radio-question.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "contentful-starting-step",
+        "id": "extended-long-answer-radio-question",
         "type": "Entry",
         "createdAt": "2020-09-07T10:56:40.585Z",
         "updatedAt": "2020-09-14T22:16:54.633Z",
@@ -37,7 +37,7 @@
           {
               "value": "Catering",
               "help_text": "",
-              "display_further_information": true,
+              "display_further_information": "long",
               "further_information_help_text": "Briefly describe why you need catering"
           },
           {
diff --git a/spec/fixtures/contentful/steps/extended-radio-question.json b/spec/fixtures/contentful/steps/extended-radio-question.json
new file mode 100644
index 000000000..519697a02
--- /dev/null
+++ b/spec/fixtures/contentful/steps/extended-radio-question.json
@@ -0,0 +1,50 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "extended-radio-question",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Tell us which service you need.",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering",
+              "help_text": "",
+              "display_further_information": true
+          },
+          {
+              "value": "Cleaning",
+              "help_text": "All interior areas of the school only",
+              "display_further_information": false,
+              "further_information_help_text": "Briefly describe why you need cleaning"
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
new file mode 100644
index 000000000..4932d7b39
--- /dev/null
+++ b/spec/fixtures/contentful/steps/hidden-field-that-shows-an-additional-question.json
@@ -0,0 +1,52 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field-that-shows-an-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What colour is the sky?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "Red"
+            },
+            {
+                "value": "Blue"
+            }
+        ],
+        "alwaysShowTheUser": false,
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "Red",
+              "question_identifiers": ["hidden-field"]
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/hidden-field.json b/spec/fixtures/contentful/steps/hidden-field.json
new file mode 100644
index 000000000..c6ce2f5de
--- /dev/null
+++ b/spec/fixtures/contentful/steps/hidden-field.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should NOT be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "alwaysShowTheUser": false
+    }
+}
diff --git a/spec/fixtures/contentful/steps/long-text-question.json b/spec/fixtures/contentful/steps/long-text-question.json
new file mode 100644
index 000000000..525896e99
--- /dev/null
+++ b/spec/fixtures/contentful/steps/long-text-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "long-text-question",
+        "type": "Entry",
+        "createdAt": "2020-11-11T11:26:20.994Z",
+        "updatedAt": "2020-11-11T11:26:20.994Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/describe-what-you-need",
+        "title": "Describe what you need",
+        "helpText": "Briefly describe what you are looking to procure from your supplier.",
+        "type": "long text",
+        "next": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-single-date-question"
+            }
+          }
+    }
+}
diff --git a/spec/fixtures/contentful/steps/markdown-help-text.json b/spec/fixtures/contentful/steps/markdown-help-text.json
new file mode 100644
index 000000000..d82001c52
--- /dev/null
+++ b/spec/fixtures/contentful/steps/markdown-help-text.json
@@ -0,0 +1,45 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "jspwts36h1os"
+            }
+        },
+        "id": "markdown-help-text",
+        "type": "Entry",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 7,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/which-service",
+        "title": "Which service do you need?",
+        "helpText": "Paragraph Test: Paragraph 1\n\nParagraph Test: Paragraph 2\n\n**Bold text** test\n\n- List item one\n- List item two\n- List item three",
+        "type": "radios",
+        "extendedOptions": [
+          {
+              "value": "Catering"
+          },
+          {
+              "value": "Cleaning"
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/no-next-question-example.json b/spec/fixtures/contentful/steps/nil-help-text-radios.json
similarity index 66%
rename from spec/fixtures/contentful/no-next-question-example.json
rename to spec/fixtures/contentful/steps/nil-help-text-radios.json
index 677a48d26..cfd393998 100644
--- a/spec/fixtures/contentful/no-next-question-example.json
+++ b/spec/fixtures/contentful/steps/nil-help-text-radios.json
@@ -7,10 +7,10 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "5lYcZs1ootDrOnk09LDLZg",
+        "id": "nil-help-text-radios",
         "type": "Entry",
-        "createdAt": "2020-09-14T19:23:05.211Z",
-        "updatedAt": "2020-09-14T19:23:05.211Z",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
         "environment": {
             "sys": {
                 "id": "master",
@@ -18,7 +18,7 @@
                 "linkType": "Environment"
             }
         },
-        "revision": 1,
+        "revision": 7,
         "contentType": {
             "sys": {
                 "type": "Link",
@@ -29,16 +29,15 @@
         "locale": "en-US"
     },
     "fields": {
-        "slug": "/which-goods",
-        "title": "Which goods do you need?",
-        "helpText": "Tell us which goods you need.",
+        "slug": "/which-service",
+        "title": "Which service do you need?",
         "type": "radios",
         "extendedOptions": [
           {
-              "value": "Stationary"
+              "value": "Catering"
           },
           {
-              "value": "IT supplies"
+              "value": "Cleaning"
           }
         ]
     }
diff --git a/spec/fixtures/contentful/steps/nil-help-text-short-text.json b/spec/fixtures/contentful/steps/nil-help-text-short-text.json
new file mode 100644
index 000000000..6b12a1fc7
--- /dev/null
+++ b/spec/fixtures/contentful/steps/nil-help-text-short-text.json
@@ -0,0 +1,36 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "nil-help-text-short-text",
+        "type": "Entry",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/what-email-address-did-you-use",
+        "title": "What email address did you use?",
+        "type": "short text"
+    }
+}
diff --git a/spec/fixtures/contentful/steps/no-hidden-field.json b/spec/fixtures/contentful/steps/no-hidden-field.json
new file mode 100644
index 000000000..f8a166510
--- /dev/null
+++ b/spec/fixtures/contentful/steps/no-hidden-field.json
@@ -0,0 +1,48 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "hidden-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should NOT be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/no-primary-button-example.json b/spec/fixtures/contentful/steps/no-primary-button.json
similarity index 100%
rename from spec/fixtures/contentful/no-primary-button-example.json
rename to spec/fixtures/contentful/steps/no-primary-button.json
diff --git a/spec/fixtures/contentful/steps/number-question.json b/spec/fixtures/contentful/steps/number-question.json
new file mode 100644
index 000000000..5ed0e299b
--- /dev/null
+++ b/spec/fixtures/contentful/steps/number-question.json
@@ -0,0 +1,37 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "number-question",
+        "type": "Number",
+        "createdAt": "2020-11-05T16:42:58.340Z",
+        "updatedAt": "2020-11-05T16:42:58.340Z",
+        "environment": {
+            "sys": {
+                "id": "master",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/how-many-days-of-the-year-will-the-service-operate",
+        "title": "How many days of the year will the service operate?",
+        "helpText": "This is the maximum number of days including expected periods of school closures, such as snow days, inset days and polling days. It does not include unexpected periods of closures.",
+        "type": "number"
+    }
+}
diff --git a/spec/fixtures/contentful/primary-button-example.json b/spec/fixtures/contentful/steps/primary-button.json
similarity index 100%
rename from spec/fixtures/contentful/primary-button-example.json
rename to spec/fixtures/contentful/steps/primary-button.json
diff --git a/spec/fixtures/contentful/radio-question-example.json b/spec/fixtures/contentful/steps/radio-question.json
similarity index 93%
rename from spec/fixtures/contentful/radio-question-example.json
rename to spec/fixtures/contentful/steps/radio-question.json
index ddf2ba23b..870ae6272 100644
--- a/spec/fixtures/contentful/radio-question-example.json
+++ b/spec/fixtures/contentful/steps/radio-question.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "contentful-radio-question",
+        "id": "radio-question",
         "type": "Entry",
         "createdAt": "2020-09-07T10:56:40.585Z",
         "updatedAt": "2020-09-14T22:16:54.633Z",
@@ -40,6 +40,7 @@
           {
               "value": "Cleaning"
           }
-        ]
+        ],
+        "alwaysShowTheUser": true
     }
 }
diff --git a/spec/fixtures/contentful/has-next-question-example.json b/spec/fixtures/contentful/steps/radio-with-separator-question.json
similarity index 70%
rename from spec/fixtures/contentful/has-next-question-example.json
rename to spec/fixtures/contentful/steps/radio-with-separator-question.json
index 2e07763ab..3bbc22ade 100644
--- a/spec/fixtures/contentful/has-next-question-example.json
+++ b/spec/fixtures/contentful/steps/radio-with-separator-question.json
@@ -7,10 +7,10 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "47EI2X2T5EDTpJX9WjRR9p",
+        "id": "radio-with-separator-question",
         "type": "Entry",
-        "createdAt": "2020-09-14T19:23:05.211Z",
-        "updatedAt": "2020-09-14T19:23:05.211Z",
+        "createdAt": "2020-09-07T10:56:40.585Z",
+        "updatedAt": "2020-09-14T22:16:54.633Z",
         "environment": {
             "sys": {
                 "id": "master",
@@ -18,7 +18,7 @@
                 "linkType": "Environment"
             }
         },
-        "revision": 1,
+        "revision": 7,
         "contentType": {
             "sys": {
                 "type": "Link",
@@ -38,15 +38,10 @@
               "value": "Catering"
           },
           {
-              "value": "Cleaning"
+              "value": "Cleaning",
+              "separated_by_or": true
           }
         ],
-        "next": {
-            "sys": {
-                "type": "Link",
-                "linkType": "Entry",
-                "id": "5lYcZs1ootDrOnk09LDLZg"
-            }
-        }
+        "alwaysShowTheUser": true
     }
 }
diff --git a/spec/fixtures/contentful/short-text-question-example.json b/spec/fixtures/contentful/steps/short-text-question.json
similarity index 96%
rename from spec/fixtures/contentful/short-text-question-example.json
rename to spec/fixtures/contentful/steps/short-text-question.json
index 4c945fa53..9c61f32e8 100644
--- a/spec/fixtures/contentful/short-text-question-example.json
+++ b/spec/fixtures/contentful/steps/short-text-question.json
@@ -7,7 +7,7 @@
                 "id": "rwl7tyzv9sys"
             }
         },
-        "id": "hfjJgWRg4xiiiImwVRDtZ",
+        "id": "short-text-question",
         "type": "Entry",
         "createdAt": "2020-11-05T16:42:58.340Z",
         "updatedAt": "2020-11-05T16:42:58.340Z",
diff --git a/spec/fixtures/contentful/steps/show-multiple-additional-questions.json b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
new file mode 100644
index 000000000..2111c774d
--- /dev/null
+++ b/spec/fixtures/contentful/steps/show-multiple-additional-questions.json
@@ -0,0 +1,64 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "show-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What support do you have available?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert",
+                "display_further_information": true,
+                "further_information_help_text": "Explain why this is the case"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "Yes",
+              "question_identifiers": [
+                  "ZoOchclnfw6tPZ0xfYL0h"
+              ]
+          },
+          {
+              "required_answer": "No",
+              "question_identifiers": [
+                  "wSeEY4HlESoDJSUsE2wJQ"
+              ]
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/show-one-additional-question.json b/spec/fixtures/contentful/steps/show-one-additional-question.json
new file mode 100644
index 000000000..6ccd9f224
--- /dev/null
+++ b/spec/fixtures/contentful/steps/show-one-additional-question.json
@@ -0,0 +1,56 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "show-one-additional-question",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "What support do you have available?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert",
+                "display_further_information": true,
+                "further_information_help_text": "Explain why this is the case"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "showAdditionalQuestion": [
+          {
+              "required_answer": "School expert",
+              "question_identifiers": ["hidden-field-that-shows-an-additional-question"]
+          }
+        ]
+    }
+}
diff --git a/spec/fixtures/contentful/steps/shown-field.json b/spec/fixtures/contentful/steps/shown-field.json
new file mode 100644
index 000000000..6ccbdbc07
--- /dev/null
+++ b/spec/fixtures/contentful/steps/shown-field.json
@@ -0,0 +1,49 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "shown-field",
+        "type": "Entry",
+        "createdAt": "2020-11-04T12:28:24.460Z",
+        "updatedAt": "2021-02-09T11:28:12.031Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 11,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/available-support",
+        "type": "radios",
+        "title": "You should be able to see this question?",
+        "helpText": "Tell us what support you have available to you.",
+        "extendedOptions": [
+            {
+                "value": "School expert"
+            },
+            {
+                "value": "External expert"
+            },
+            {
+                "value": "None"
+            }
+        ],
+        "alwaysShowTheUser": true
+    }
+}
diff --git a/spec/fixtures/contentful/steps/single-date-question.json b/spec/fixtures/contentful/steps/single-date-question.json
new file mode 100644
index 000000000..b14bcef83
--- /dev/null
+++ b/spec/fixtures/contentful/steps/single-date-question.json
@@ -0,0 +1,44 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "single-date-question",
+        "type": "Entry",
+        "createdAt": "2020-12-08T10:43:19.102Z",
+        "updatedAt": "2020-12-08T10:43:19.102Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/starting-date",
+        "type": "single date",
+        "title": "When will this start?",
+        "helpText": "This will help set the timetable",
+        "next": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Entry",
+                "id": "contentful-checkboxes-question"
+            }
+          }
+    }
+}
diff --git a/spec/fixtures/contentful/steps/skippable-checkboxes-question.json b/spec/fixtures/contentful/steps/skippable-checkboxes-question.json
new file mode 100644
index 000000000..63196cd94
--- /dev/null
+++ b/spec/fixtures/contentful/steps/skippable-checkboxes-question.json
@@ -0,0 +1,43 @@
+{
+    "sys": {
+        "space": {
+            "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "rwl7tyzv9sys"
+            }
+        },
+        "id": "skippable-checkboxes-question",
+        "type": "Entry",
+        "createdAt": "2020-12-09T11:53:52.744Z",
+        "updatedAt": "2020-12-09T11:53:52.744Z",
+        "environment": {
+            "sys": {
+                "id": "develop",
+                "type": "Link",
+                "linkType": "Environment"
+            }
+        },
+        "revision": 1,
+        "contentType": {
+            "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "question"
+            }
+        },
+        "locale": "en-US"
+    },
+    "fields": {
+        "slug": "/everyday-services",
+        "type": "checkboxes",
+        "title": "Everyday services that are required and need to be considered",
+        "extendedOptions": [
+          { "value": "Breakfast" },
+          { "value": "Morning break" },
+          { "value": "Lunch" },
+          { "value": "Dinner" }
+        ],
+        "skipCallToAction": "None of the above"
+    }
+}
diff --git a/spec/fixtures/contentful/static-content-example.json b/spec/fixtures/contentful/steps/static-content.json
similarity index 96%
rename from spec/fixtures/contentful/static-content-example.json
rename to spec/fixtures/contentful/steps/static-content.json
index a09b1e972..c9d84162e 100644
--- a/spec/fixtures/contentful/static-content-example.json
+++ b/spec/fixtures/contentful/steps/static-content.json
@@ -7,7 +7,7 @@
         "id": "rwl7tyzv9sys"
       }
     },
-    "id": "contentful-starting-step",
+    "id": "static-content",
     "type": "Entry",
     "createdAt": "2020-12-02T10:48:35.748Z",
     "updatedAt": "2020-12-02T10:48:35.748Z",
diff --git a/spec/fixtures/contentful/an-unexpected-question-type-example.json b/spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
similarity index 93%
rename from spec/fixtures/contentful/an-unexpected-question-type-example.json
rename to spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
index 1f02406eb..6309be468 100644
--- a/spec/fixtures/contentful/an-unexpected-question-type-example.json
+++ b/spec/fixtures/contentful/steps/unexpected-contentful-question-type.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "8as7df68uhasdnuasdf",
+        "id": "unexpected-contentful-question-type",
         "type": "Entry",
         "createdAt": "2020-09-02T15:56:05.472Z",
         "updatedAt": "2020-09-02T16:19:00.652Z",
diff --git a/spec/fixtures/contentful/an-unexpected-model-example.json b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
similarity index 90%
rename from spec/fixtures/contentful/an-unexpected-model-example.json
rename to spec/fixtures/contentful/steps/unexpected-contentful-type.json
index f213d6483..97e4234a5 100644
--- a/spec/fixtures/contentful/an-unexpected-model-example.json
+++ b/spec/fixtures/contentful/steps/unexpected-contentful-type.json
@@ -7,7 +7,7 @@
                 "id": "jspwts36h1os"
             }
         },
-        "id": "6EKsv389ETYcQql3htK3Z2",
+        "id": "unexpected-contentful-type",
         "type": "Entry",
         "createdAt": "2020-09-02T15:56:05.472Z",
         "updatedAt": "2020-09-02T16:19:00.652Z",
@@ -23,7 +23,7 @@
             "sys": {
                 "type": "Link",
                 "linkType": "ContentType",
-                "id": "unmanagedPage"
+                "id": "telepathy"
             }
         },
         "locale": "en-US"
diff --git a/spec/helpers/answer_helper_spec.rb b/spec/helpers/answer_helper_spec.rb
new file mode 100644
index 000000000..0c6639dc9
--- /dev/null
+++ b/spec/helpers/answer_helper_spec.rb
@@ -0,0 +1,17 @@
+require "rails_helper"
+
+RSpec.describe AnswerHelper, type: :helper do
+  describe "#human_readable_option" do
+    it "replaces underscores with spaces and capitalises the string" do
+      result = helper.human_readable_option(string: "a_hash_key")
+      expect(result).to eql("A hash key")
+    end
+  end
+
+  describe "#machine_readable_option" do
+    it "replaces spaces with underscores, removes special characters and downcases the string" do
+      result = helper.machine_readable_option(string: "A LONG key with inconsistent casing &*()%$")
+      expect(result).to eql("a_long_key_with_inconsistent_casing")
+    end
+  end
+end
diff --git a/spec/helpers/date_helper_spec.rb b/spec/helpers/date_helper_spec.rb
new file mode 100644
index 000000000..b93e24b56
--- /dev/null
+++ b/spec/helpers/date_helper_spec.rb
@@ -0,0 +1,30 @@
+require "rails_helper"
+
+RSpec.describe DateHelper, type: :helper do
+  describe "#format_date" do
+    it "returns a Date object from params" do
+      params = {day: "1", month: "2", year: "2020"}
+      expect(helper.format_date(params)).to eq(Date.new(2020, 2, 1))
+    end
+
+    it "returns nil when passed nil" do
+      params = {}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when the date params are incomplete" do
+      params = {day: "", month: "", year: "2019"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when given an invalid date" do
+      params = {day: "40", month: "13", year: "2020"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+
+    it "returns nil when given a zero parameter" do
+      params = {day: "40", month: "0", year: "2020"}
+      expect(helper.format_date(params)).to eq(nil)
+    end
+  end
+end
diff --git a/spec/helpers/journey_helper_spec.rb b/spec/helpers/journey_helper_spec.rb
new file mode 100644
index 000000000..1d4d7df67
--- /dev/null
+++ b/spec/helpers/journey_helper_spec.rb
@@ -0,0 +1,96 @@
+require "rails_helper"
+
+RSpec.describe JourneyHelper, type: :helper do
+  describe "#section_group_with_steps" do
+    it "returns an ordered array of steps" do
+      journey = create(:journey, section_groups: "", steps: [])
+      step_1 = StepPresenter.new(create(:step, :radio, journey: journey))
+      step_2 = StepPresenter.new(create(:step, :long_text, journey: journey))
+      step_3 = StepPresenter.new(create(:step, :short_text, journey: journey))
+
+      section_groups = [
+        {
+          "order" => 0,
+          "title" => "Objectives",
+          "steps" => [
+            {
+              "contentful_id" => step_1.contentful_id,
+              "order" => 0
+            },
+            {
+              "contentful_id" => step_2.contentful_id,
+              "order" => 1
+            }
+          ]
+        },
+        {
+          "order" => 1,
+          "title" => "Social value",
+          "steps" => [
+            {
+              "contentful_id" => step_3.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+      journey.update(section_groups: section_groups)
+
+      result = helper.section_group_with_steps(
+        journey: journey, steps: [step_1, step_2, step_3]
+      )
+
+      expect(result.first["steps"]).to eq([step_1, step_2])
+      expect(result.second["steps"]).to eq([step_3])
+    end
+  end
+
+  context "when the ordering we want does not match the order saved in the database" do
+    it "the ordering defined by 'order' is preserved" do
+      journey = create(:journey, section_groups: "", steps: [])
+      step_1 = StepPresenter.new(create(:step, :radio, title: "First question", journey: journey))
+      step_2 = StepPresenter.new(create(:step, :long_text, title: "Second question", journey: journey))
+      step_3 = StepPresenter.new(create(:step, :short_text, title: "Third question", journey: journey))
+      step_4 = StepPresenter.new(create(:step, :short_text, title: "Fourth question", journey: journey))
+
+      section_groups = [
+        {
+          "order" => 1,
+          "title" => "Objectives",
+          "steps" => [
+            {
+              "contentful_id" => step_2.contentful_id,
+              "order" => 2
+            },
+            {
+              "contentful_id" => step_1.contentful_id,
+              "order" => 1
+            },
+            {
+              "contentful_id" => step_3.contentful_id,
+              "order" => 3
+            }
+          ]
+        },
+        {
+          "order" => 0,
+          "title" => "Social value",
+          "steps" => [
+            {
+              "contentful_id" => step_4.contentful_id,
+              "order" => 0
+            }
+          ]
+        }
+      ]
+      journey.update(section_groups: section_groups)
+
+      result = helper.section_group_with_steps(
+        journey: journey, steps: [step_1, step_2, step_3, step_4]
+      )
+
+      expect(result.first["steps"]).to eq([step_1, step_2, step_3])
+      expect(result.second["steps"]).to eq([step_4])
+    end
+  end
+end
diff --git a/spec/helpers/step_helper_spec.rb b/spec/helpers/step_helper_spec.rb
index 0603279db..56a3b10c2 100644
--- a/spec/helpers/step_helper_spec.rb
+++ b/spec/helpers/step_helper_spec.rb
@@ -6,9 +6,41 @@
       options = ["red", "blue"]
       result = helper.checkbox_options(array_of_options: options)
       expect(result).to match([
-        OpenStruct.new(id: "red", name: "Red"),
-        OpenStruct.new(id: "blue", name: "Blue")
+        OpenStruct.new(id: "red", name: "red"),
+        OpenStruct.new(id: "blue", name: "blue")
       ])
     end
   end
+
+  describe "#monkey_patch_form_object_with_further_information_field" do
+    it "returns the modified form_object" do
+      object = OpenStruct.new
+      result = helper.monkey_patch_form_object_with_further_information_field(
+        form_object: object,
+        associated_choice: "foo"
+      )
+      expect(result).to eq(object)
+    end
+
+    it "adds a singleton method to the object" do
+      object = OpenStruct.new
+      result = helper.monkey_patch_form_object_with_further_information_field(
+        form_object: object,
+        associated_choice: "foo"
+      )
+      expect(result.foo_further_information).to eq(nil)
+      expect(result.foo_further_information = "bar").to eql("bar")
+    end
+
+    context "when the object has a further_information field" do
+      it "adds a singleton method with the same value as the return value" do
+        object = OpenStruct.new(further_information: {"foo_further_information" => :bar})
+        result = helper.monkey_patch_form_object_with_further_information_field(
+          form_object: object,
+          associated_choice: "foo"
+        )
+        expect(result.foo_further_information).to eq(:bar)
+      end
+    end
+  end
 end
diff --git a/spec/jobs/warm_entry_cache_job_spec.rb b/spec/jobs/warm_entry_cache_job_spec.rb
index 158dbbeb2..2fd8dd8fc 100644
--- a/spec/jobs/warm_entry_cache_job_spec.rb
+++ b/spec/jobs/warm_entry_cache_job_spec.rb
@@ -3,12 +3,14 @@
 RSpec.describe WarmEntryCacheJob, type: :job do
   include ActiveJob::TestHelper
 
-  before(:each) { ActiveJob::Base.queue_adapter = :test }
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+  end
   after(:each) { RedisCache.redis.flushdb }
 
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step",
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry",
       CONTENTFUL_ENTRY_CACHING: "true"
     ) do
       example.run
@@ -23,35 +25,33 @@
     end
 
     it "asks GetAllContentfulEntries for the Contentful entries" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "multiple-entries-example.json"
-      )
+      stub_contentful_category(fixture_filename: "journey-with-multiple-entries.json")
 
       described_class.perform_later
       perform_enqueued_jobs
 
-      expect(RedisCache.redis.get("contentful:entry:contentful-starting-step"))
-        .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"rwl7tyzv9sys\\\"}},\\\"id\\\":\\\"contentful-starting-step\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-12-02T10:48:35.748Z\\\",\\\"updatedAt\\\":\\\"2020-12-02T10:48:35.748Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"develop\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":1,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"staticContent\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/timelines\\\",\\\"title\\\":\\\"When you should start\\\",\\\"body\\\":\\\"Procuring a new catering contract can take up to 6 months to consult, create, review and award. \\\\n\\\\nUsually existing contracts start and end in the month of September. We recommend starting this process around March.\\\",\\\"type\\\":\\\"paragraphs\\\",\\\"next\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Entry\\\",\\\"id\\\":\\\"hfjJgWRg4xiiiImwVRDtZ\\\"}}}}\""
-        )
-      expect(RedisCache.redis.get("contentful:entry:hfjJgWRg4xiiiImwVRDtZ"))
+      expect(RedisCache.redis.get("contentful:entry:radio-question"))
         .to eql(
-          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"rwl7tyzv9sys\\\"}},\\\"id\\\":\\\"hfjJgWRg4xiiiImwVRDtZ\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-11-04T12:28:30.442Z\\\",\\\"updatedAt\\\":\\\"2020-11-26T16:39:54.188Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"develop\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":6,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/dev-start-which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\""
+          "\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}],\\\"alwaysShowTheUser\\\":true}}\""
         )
+      expect(RedisCache.redis.get("contentful:entry:short-text-question"))
+        .not_to be_nil
+
+      expect(RedisCache.redis.get("contentful:entry:long-text-question"))
+        .not_to be_nil
     end
 
     context "when the journey order cannot be built" do
       it "does not add new items to the cache" do
-        allow_any_instance_of(BuildJourneyOrder)
-          .to receive(:call)
-          .and_raise(BuildJourneyOrder::RepeatEntryDetected)
-
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
+        stub_contentful_category(
+          fixture_filename: "journey-with-multiple-entries.json",
+          stub_steps: false
         )
 
+        allow_any_instance_of(GetStepsFromSection)
+          .to receive(:call)
+          .and_raise(GetStepsFromSection::RepeatEntryDetected)
+
         described_class.perform_later
         perform_enqueued_jobs
 
@@ -61,15 +61,15 @@
       it "extends the TTL on all existing items by 24 hours" do
         RedisCache.redis.set("contentful:entry:contentful-starting-step", "\"{\\}\"")
 
-        allow_any_instance_of(BuildJourneyOrder)
-          .to receive(:call)
-          .and_raise(BuildJourneyOrder::RepeatEntryDetected)
-
-        stub_get_contentful_entries(
-          entry_id: "contentful-starting-step",
-          fixture_filename: "repeat-entry-example.json"
+        stub_contentful_category(
+          fixture_filename: "journey-with-multiple-entries.json",
+          stub_steps: false
         )
 
+        allow_any_instance_of(GetStepsFromSection)
+          .to receive(:call)
+          .and_raise(GetStepsFromSection::RepeatEntryDetected)
+
         freeze_time do
           ttl_extension = 60 * 60 * 24
           existing_ttl = -1
diff --git a/spec/lib/vcap_parser_spec.rb b/spec/lib/vcap_parser_spec.rb
new file mode 100644
index 000000000..d6b8f605c
--- /dev/null
+++ b/spec/lib/vcap_parser_spec.rb
@@ -0,0 +1,49 @@
+require "rails_helper"
+require "vcap_parser"
+
+RSpec.describe VcapParser do
+  describe ".load_service_environment_variables!" do
+    it "loads service level environment variables to the ENV" do
+      vcap_json = '
+        {
+           "user-provided": [
+            {
+             "credentials": {
+              "ENV1": "ENV1VALUE",
+              "ENV2": "ENV2VALUE"
+             }
+            }
+           ]
+         }
+      '
+      ClimateControl.modify VCAP_SERVICES: vcap_json do
+        VcapParser.load_service_environment_variables!
+        expect(ENV["ENV2"]).to eq("ENV2VALUE")
+      end
+    end
+
+    it "loads redis URL to the ENV" do
+      vcap_json = '
+        {
+          "redis": [
+           {
+              "credentials": {
+                "uri": "rediss://x:REDACTED@HOST:6379"
+              }
+            }
+          ]
+        }
+      '
+      ClimateControl.modify VCAP_SERVICES: vcap_json do
+        VcapParser.load_service_environment_variables!
+        expect(ENV["REDIS_URL"]).to eq("rediss://x:REDACTED@HOST:6379")
+      end
+    end
+
+    it "does not error if VCAP_SERVICES is not set" do
+      ClimateControl.modify VCAP_SERVICES: nil do
+        expect { VcapParser.load_service_environment_variables! }.to_not raise_error
+      end
+    end
+  end
+end
diff --git a/spec/models/checkbox_answers_spec.rb b/spec/models/checkbox_answers_spec.rb
index e2bf38f8e..a8571ad42 100644
--- a/spec/models/checkbox_answers_spec.rb
+++ b/spec/models/checkbox_answers_spec.rb
@@ -1,7 +1,10 @@
 require "rails_helper"
 
 RSpec.describe CheckboxAnswers, type: :model do
-  it { should belong_to(:step) }
+  it "should belong_to a step" do
+    association = described_class.reflect_on_association(:step)
+    expect(association.macro).to eq(:belongs_to)
+  end
 
   describe "#response" do
     it "returns an array of strings" do
@@ -11,7 +14,21 @@
   end
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:response) }
+    it "is not valid if there is no response" do
+      answer = build(:checkbox_answers, response: [])
+      expect(answer).not_to be_valid
+    end
+
+    context "when the step is skippable" do
+      it "does not validate the presence of the response" do
+        skippable_step = create(:step, :checkbox_answers, skip_call_to_action_text: "None of the above")
+        answer = build(:checkbox_answers, step: skippable_step, response: "", skipped: true)
+
+        answer.save
+
+        expect(answer.persisted?).to be true
+      end
+    end
   end
 
   describe "#response=" do
diff --git a/spec/models/currency_answer_spec.rb b/spec/models/currency_answer_spec.rb
new file mode 100644
index 000000000..5705fa1cb
--- /dev/null
+++ b/spec/models/currency_answer_spec.rb
@@ -0,0 +1,21 @@
+require "rails_helper"
+
+RSpec.describe CurrencyAnswer, type: :model do
+  it { should belong_to(:step) }
+
+  describe "#response" do
+    it "correctly strips out commas from a string" do
+      answer = build(:currency_answer, response: "1,000.01")
+      expect(answer.response).to eq(1000.01)
+    end
+
+    it "returns a number" do
+      answer = build(:currency_answer, response: "1000.01")
+      expect(answer.response).to eq(1000.01)
+    end
+  end
+
+  describe "validations" do
+    it { is_expected.to validate_presence_of(:response) }
+  end
+end
diff --git a/spec/models/journey_spec.rb b/spec/models/journey_spec.rb
index 1d9cb3d78..550a82166 100644
--- a/spec/models/journey_spec.rb
+++ b/spec/models/journey_spec.rb
@@ -4,6 +4,7 @@
   it { should have_many(:steps) }
 
   describe "validations" do
+    it { is_expected.to validate_presence_of(:category) }
     it { is_expected.to validate_presence_of(:liquid_template) }
   end
 
@@ -12,8 +13,55 @@
     expect(journey.category).to eql("catering")
   end
 
-  it "stores an identifier for the next Contentful Entry" do
-    journey = build(:journey, :catering, next_entry_id: "47EI2X2T5EDTpJX9WjRR9p")
-    expect(journey.next_entry_id).to eql("47EI2X2T5EDTpJX9WjRR9p")
+  describe "all_steps_completed?" do
+    context "when all steps have been completed" do
+      it "returns true" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        step_2 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_2)
+
+        expect(journey.all_steps_completed?).to be true
+      end
+    end
+
+    context "when no steps have been completed" do
+      it "returns false " do
+        journey = create(:journey)
+
+        create_list(:step, 2, :radio, journey: journey)
+
+        expect(journey.all_steps_completed?).to be false
+      end
+    end
+
+    context "when only some steps have been completed" do
+      it "returns false" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        create(:step, :radio, journey: journey)
+
+        expect(journey.all_steps_completed?).to be false
+      end
+    end
+
+    context "when there are uncompleted hidden steps" do
+      it "ignores them and returns true" do
+        journey = create(:journey)
+
+        step_1 = create(:step, :radio, journey: journey)
+        create(:radio_answer, step: step_1)
+
+        _hidden_step_without_an_answer = create(:step, :radio, journey: journey, hidden: true)
+
+        expect(journey.all_steps_completed?).to be true
+      end
+    end
   end
 end
diff --git a/spec/models/result_spec.rb b/spec/models/result_spec.rb
new file mode 100644
index 000000000..02ae20e19
--- /dev/null
+++ b/spec/models/result_spec.rb
@@ -0,0 +1,39 @@
+RSpec.describe Result do
+  describe "#success?" do
+    it "returns true when set to true" do
+      result = described_class.new(true).success?
+      expect(result).to eq true
+    end
+
+    it "returns false when set to false" do
+      result = described_class.new(false).success?
+      expect(result).to eq false
+    end
+  end
+
+  describe "#failure?" do
+    it "returns true when set to false" do
+      result = described_class.new(false).failure?
+      expect(result).to eq true
+    end
+
+    it "returns false when set to true" do
+      result = described_class.new(true).failure?
+      expect(result).to eq false
+    end
+  end
+
+  describe "#object" do
+    it "returns an object when set" do
+      object = double
+      result = described_class.new(true, object).object
+      expect(result).to eq object
+    end
+
+    it "returns nil when not set" do
+      _object = double
+      result = described_class.new(true).object
+      expect(result).to eq nil
+    end
+  end
+end
diff --git a/spec/models/single_date_answer_spec.rb b/spec/models/single_date_answer_spec.rb
index 58d8ac896..a10742c94 100644
--- a/spec/models/single_date_answer_spec.rb
+++ b/spec/models/single_date_answer_spec.rb
@@ -11,6 +11,11 @@
   end
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:response) }
+    it "validates missing response" do
+      answer = build(:single_date_answer, response: nil)
+
+      expect(answer.valid?).to eq(false)
+      expect(answer.errors.full_messages.first).to include(I18n.t("activerecord.errors.models.single_date_answer.attributes.response"))
+    end
   end
 end
diff --git a/spec/models/step_spec.rb b/spec/models/step_spec.rb
index 77a164794..22206faa5 100644
--- a/spec/models/step_spec.rb
+++ b/spec/models/step_spec.rb
@@ -77,6 +77,20 @@
     end
   end
 
+  describe "#skippable?" do
+    it "returns true if there is skip_call_to_action_text" do
+      step = build(:step, skip_call_to_action_text: "None of the above")
+      result = step.skippable?
+      expect(result).to eq(true)
+    end
+
+    it "returns false if there is NOT skip_call_to_action_text" do
+      step = build(:step, skip_call_to_action_text: nil)
+      result = step.skippable?
+      expect(result).to eq(false)
+    end
+  end
+
   describe "#options" do
     # TODO: This will need updating when options are set on the step with the new format
     it "returns a hash of options" do
diff --git a/spec/models/user_session_spec.rb b/spec/models/user_session_spec.rb
new file mode 100644
index 000000000..950d3acdf
--- /dev/null
+++ b/spec/models/user_session_spec.rb
@@ -0,0 +1,132 @@
+require "rails_helper"
+
+RSpec.describe UserSession, type: :model do
+  include Rails.application.routes.url_helpers
+  let(:session) { double(ActionDispatch::Request::Session) }
+
+  describe "#persist_successful_dfe_sign_in_claim!" do
+    it "stores the DfE Sign-in UID in the session" do
+      omniauth_hash = {
+        "uid" => "123",
+        "credentials" => {
+          "id_token" => "456"
+        }
+      }
+
+      user_session = described_class.new(session: session)
+
+      expect(session).to receive(:[]=).with(:dfe_sign_in_uid, "123")
+      expect(session).to receive(:[]=).with(:dfe_sign_in_sign_out_token, "456")
+
+      user_session.persist_successful_dfe_sign_in_claim!(omniauth_hash: omniauth_hash)
+    end
+  end
+
+  describe "#repudiate!" do
+    it "removes the DfE sign in claim from the session" do
+      user_session = described_class.new(session: session)
+
+      expect(session).to receive(:delete).with(:dfe_sign_in_uid)
+      expect(session).to receive(:delete).with(:dfe_sign_in_sign_out_token)
+
+      user_session.repudiate!
+    end
+  end
+
+  describe "#should_be_signed_out_of_dsi?" do
+    it "returns true when there is a sign out token" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("a-long-token")
+
+      result = described_class.new(session: session_with_sign_out_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(true)
+    end
+
+    it "returns false when the sign out token value is blank" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("")
+
+      result = described_class.new(session: session_with_sign_out_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(false)
+    end
+
+    it "returns false when there is no sign out token" do
+      session_without_sign_in_token = double(ActionDispatch::Request::Session)
+      allow(session_without_sign_in_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(false)
+
+      result = described_class.new(session: session_without_sign_in_token)
+        .should_be_signed_out_of_dsi?
+
+      expect(result).to eq(false)
+    end
+  end
+
+  describe "#sign_out_url" do
+    around do |example|
+      ClimateControl.modify(
+        DFE_SIGN_IN_ISSUER: "https://test-oidc.signin.education.gov.uk:443"
+      ) do
+        example.run
+      end
+    end
+
+    it "returns a URL that can be sent to DfE Sign-in to sign the user out of their service" do
+      session_with_sign_out_token = double(ActionDispatch::Request::Session)
+
+      allow(session_with_sign_out_token)
+        .to receive(:key?)
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return(true)
+
+      allow(session_with_sign_out_token)
+        .to receive(:[])
+        .with(:dfe_sign_in_sign_out_token)
+        .and_return("a-long-token")
+
+      user_session = described_class.new(session: session_with_sign_out_token)
+
+      result = user_session.sign_out_url
+
+      expect(result).to eq("https://test-oidc.signin.education.gov.uk:443/session/end?id_token_hint=a-long-token&post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fdfe%2Fsignout")
+    end
+
+    context "when the user has no sign out token" do
+      it "redirects the user to the root path" do
+        session_without_sign_in_token = double(ActionDispatch::Request::Session)
+        allow(session_without_sign_in_token)
+          .to receive(:key?)
+          .with(:dfe_sign_in_sign_out_token)
+          .and_return(false)
+
+        user_session = described_class.new(session: session_without_sign_in_token)
+
+        result = user_session.sign_out_url
+
+        expect(result).to eql(root_path)
+      end
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 000000000..590fe7f80
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,8 @@
+require "rails_helper"
+
+RSpec.describe User, type: :model do
+  it "store the user's DfE Sign-in UID" do
+    user = build(:user, dfe_sign_in_uid: "a96ee522-2de8-4eb1-9b17-9619a310149b")
+    expect(user.dfe_sign_in_uid).to eql("a96ee522-2de8-4eb1-9b17-9619a310149b")
+  end
+end
diff --git a/spec/presenters/checkboxes_answer_presenter_spec.rb b/spec/presenters/checkboxes_answer_presenter_spec.rb
index 13ab392c1..61eaa00b9 100644
--- a/spec/presenters/checkboxes_answer_presenter_spec.rb
+++ b/spec/presenters/checkboxes_answer_presenter_spec.rb
@@ -2,10 +2,91 @@
 
 RSpec.describe CheckboxesAnswerPresenter do
   describe "#response" do
-    it "returns all none nil values, capitalised as a comma separated string" do
-      step = build(:checkbox_answers, response: ["yes", "no", ""])
+    it "returns all none nil values as an array" do
+      step = build(:checkbox_answers, response: ["Yes", "No", "Morning break", ""])
       presenter = described_class.new(step)
-      expect(presenter.response).to eq("Yes, No")
+      expect(presenter.response).to eq(["Yes", "No", "Morning break"])
+    end
+  end
+
+  describe "#to_param" do
+    it "returns a hash of options" do
+      step = build(:checkbox_answers,
+        response: ["Yes", "No"],
+        skipped: false,
+        further_information: {
+          yes_further_information: "More yes info",
+          no_further_information: "More no info"
+        })
+
+      presenter = described_class.new(step)
+
+      expect(presenter.to_param).to eql({
+        response: ["Yes", "No"],
+        skipped: false,
+        concatenated_response: "Yes, No",
+        selected_answers: [
+          {
+            machine_value: :yes,
+            human_value: "Yes",
+            further_information: "More yes info"
+          },
+          {
+            machine_value: :no,
+            human_value: "No",
+            further_information: "More no info"
+          }
+        ]
+      })
+    end
+
+    context "when there is no response" do
+      it "sets the response to an empty array" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({response: []})
+      end
+
+      it "sets the concatenated_response to an array with an empty hash" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({selected_answers: []})
+      end
+
+      it "sets the concatenated_response to a nil" do
+        step = build(:checkbox_answers, response: [])
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({concatenated_response: nil})
+      end
+    end
+
+    context "when the answer is skipped" do
+      it "sets the skipped value to true" do
+        step = build(:checkbox_answers, skipped: true)
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to include({skipped: true})
+      end
+    end
+
+    context "when the option includes special characters" do
+      it "the further_information is correctly returned" do
+        step = build(:checkbox_answers,
+          response: ["Other, please specify"],
+          further_information: {"other_please_specify_further_information": "Sinks and stuff"})
+        presenter = described_class.new(step)
+        expect(presenter.to_param).to eql({
+          response: ["Other, please specify"],
+          skipped: false,
+          concatenated_response: "Other, please specify",
+          selected_answers: [
+            {
+              machine_value: :other_please_specify,
+              human_value: "Other, please specify",
+              further_information: "Sinks and stuff"
+            }
+          ]
+        })
+      end
     end
   end
 end
diff --git a/spec/presenters/currency_answer_presenter_spec.rb b/spec/presenters/currency_answer_presenter_spec.rb
new file mode 100644
index 000000000..44f889be5
--- /dev/null
+++ b/spec/presenters/currency_answer_presenter_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+RSpec.describe CurrencyAnswerPresenter do
+  describe "#response" do
+    it "returns the response formatted as a currency" do
+      step = build(:currency_answer, response: 1000.01)
+      presenter = described_class.new(step)
+      expect(presenter.response).to eq("£1,000.01")
+    end
+  end
+
+  describe "#to_param" do
+    it "returns a hash of currency_answer" do
+      step = build(:currency_answer, response: 100.00)
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "£100.00"})
+    end
+  end
+end
diff --git a/spec/presenters/long_text_answer_presenter_spec.rb b/spec/presenters/long_text_answer_presenter_spec.rb
index dce4bfa99..1df73f7c2 100644
--- a/spec/presenters/long_text_answer_presenter_spec.rb
+++ b/spec/presenters/long_text_answer_presenter_spec.rb
@@ -16,4 +16,12 @@
       end
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of long_text_answer" do
+      step = build(:long_text_answer, response: "First line\r\nSecond line")
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "<p>First line\n<br />Second line</p>"})
+    end
+  end
 end
diff --git a/spec/presenters/number_answer_presenter_spec.rb b/spec/presenters/number_answer_presenter_spec.rb
new file mode 100644
index 000000000..32af5c4cd
--- /dev/null
+++ b/spec/presenters/number_answer_presenter_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+RSpec.describe NumberAnswerPresenter do
+  describe "#response" do
+    it "returns the response as a string" do
+      step = build(:number_answer, response: 100)
+      presenter = described_class.new(step)
+      expect(presenter.response).to eq("100")
+    end
+  end
+
+  describe "#to_param" do
+    it "returns a hash of number_answer" do
+      step = build(:number_answer, response: 1)
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "1"})
+    end
+  end
+end
diff --git a/spec/presenters/radio_answer_presenter_spec.rb b/spec/presenters/radio_answer_presenter_spec.rb
index edb83426d..f5b85daa1 100644
--- a/spec/presenters/radio_answer_presenter_spec.rb
+++ b/spec/presenters/radio_answer_presenter_spec.rb
@@ -3,17 +3,26 @@
 RSpec.describe RadioAnswerPresenter do
   describe "#response" do
     it "returns the option chosen" do
-      step = build(:radio_answer, response: "Yes", further_information: "")
+      step = build(:radio_answer,
+        response: "Yes",
+        further_information: {yes_further_information: "More yes info"})
       presenter = described_class.new(step)
       expect(presenter.response).to eq("Yes")
     end
+  end
+
+  describe "#to_param" do
+    it "returns a hash of radio_answer" do
+      step = build(:radio_answer,
+        response: "Yes",
+        further_information: {yes_further_information: "More yes info"})
+
+      presenter = described_class.new(step)
 
-    context "when further information is provided" do
-      it "returns the option chosen and the further information" do
-        step = build(:radio_answer, response: "Yes", further_information: "This is really important")
-        presenter = described_class.new(step)
-        expect(presenter.response).to eq("Yes - This is really important")
-      end
+      expect(presenter.to_param).to eql({
+        response: "Yes",
+        further_information: "More yes info"
+      })
     end
   end
 end
diff --git a/spec/presenters/short_text_answer_presenter_spec.rb b/spec/presenters/short_text_answer_presenter_spec.rb
index 69c223f25..45ee3970a 100644
--- a/spec/presenters/short_text_answer_presenter_spec.rb
+++ b/spec/presenters/short_text_answer_presenter_spec.rb
@@ -8,4 +8,12 @@
       expect(presenter.response).to eq("A little of text")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of short_text_answer" do
+      step = build(:short_text_answer, response: "Red")
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "Red"})
+    end
+  end
 end
diff --git a/spec/presenters/single_date_answer_presenter_spec.rb b/spec/presenters/single_date_answer_presenter_spec.rb
index 5e0771fb3..cfe91ba54 100644
--- a/spec/presenters/single_date_answer_presenter_spec.rb
+++ b/spec/presenters/single_date_answer_presenter_spec.rb
@@ -8,4 +8,12 @@
       expect(presenter.response).to eq("30 Dec 2000")
     end
   end
+
+  describe "#to_param" do
+    it "returns a hash of single_date_answer" do
+      step = build(:single_date_answer, response: Date.new(2000, 12, 30))
+      presenter = described_class.new(step)
+      expect(presenter.to_param).to eql({response: "30 Dec 2000"})
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index f4b3d5b75..f8ca4b2c6 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -34,8 +34,10 @@
 end
 RSpec.configure do |config|
   config.include ContentfulHelpers
-  config.include LiquidHelpers
+  config.include JourneyHelpers, type: :feature
   config.include ActiveSupport::Testing::TimeHelpers
+  config.include SignInHelpers, type: :feature
+  config.include SignInHelpers, type: :request
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
new file mode 100644
index 000000000..f58d705d5
--- /dev/null
+++ b/spec/requests/authentication_spec.rb
@@ -0,0 +1,107 @@
+require "rails_helper"
+
+RSpec.describe "Authentication", type: :request do
+  describe "Endpoints that don't require authentication" do
+    it "the health_check endpoint is not authenticated" do
+      get health_check_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the specification start page" do
+      get root_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the planning guidance page" do
+      get planning_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "users can access the new session endpoint" do
+      post "/auth/dfe"
+      expect(response).to have_http_status(:found)
+    end
+
+    it "DfE Sign-in can redirect users back to the service with the callback endpoint" do
+      get auth_dfe_callback_path
+      expect(response).to have_http_status(:found)
+    end
+
+    it "DfE Sign-in can sign users out" do
+      get auth_dfe_signout_path
+      expect(response).to have_http_status(:found)
+    end
+  end
+
+  describe "Endpoints that do require authentication" do
+    it "users cannot access the new journey path" do
+      get new_journey_path
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "users cannot access an existing journey" do
+      journey = create(:journey)
+      get journey_path(journey)
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "users cannot edit an answer" do
+      answer = create(:radio_answer)
+      get edit_journey_step_path(answer.step.journey, answer.step)
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "users cannot see the journey map" do
+      get new_journey_map_path
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "users cannot see the preview endpoints" do
+      get preview_entry_path("an-entry-id")
+      expect(response).to redirect_to(root_path)
+    end
+  end
+
+  describe "Sign out" do
+    it "asks UserSession to repudiate the user's session data" do
+      user_exists_in_dfe_sign_in
+      expect_any_instance_of(UserSession).to receive(:repudiate!)
+
+      get auth_dfe_signout_path
+
+      expect(response).to redirect_to(root_path)
+    end
+
+    context "when there is no sign out token (they are already signed out from the applications point of view)" do
+      it "redirects the user to the root path" do
+        user_exists_in_dfe_sign_in
+        allow_any_instance_of(UserSession)
+          .to receive(:should_be_signed_out_of_dsi?).and_return(false)
+
+        get auth_dfe_signout_path
+
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    context "when there is a sign out token" do
+      around do |example|
+        ClimateControl.modify(
+          DFE_SIGN_IN_ISSUER: "https://test-oidc.signin.education.gov.uk:443"
+        ) do
+          example.run
+        end
+      end
+
+      it "redirects to DSI with the users token" do
+        user_exists_in_dfe_sign_in
+        allow_any_instance_of(UserSession)
+          .to receive(:should_be_signed_out_of_dsi?).and_return(true)
+
+        get auth_dfe_signout_path
+
+        expect(response).to redirect_to("https://test-oidc.signin.education.gov.uk:443/session/end?id_token_hint=&post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fdfe%2Fsignout")
+      end
+    end
+  end
+end
diff --git a/spec/requests/authorisation_spec.rb b/spec/requests/authorisation_spec.rb
new file mode 100644
index 000000000..920e9f77e
--- /dev/null
+++ b/spec/requests/authorisation_spec.rb
@@ -0,0 +1,28 @@
+require "rails_helper"
+
+RSpec.describe "Authorisation", type: :request do
+  describe "Users can only see journeys they belong to" do
+    context "when the journey IS theirs" do
+      it "returns 200" do
+        journey = create(:journey)
+        user_is_signed_in(user: journey.user)
+
+        get journey_path(journey)
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context "when the journey is NOT theirs" do
+      it "returns 404" do
+        another_user = build(:user)
+        journey = create(:journey)
+        user_is_signed_in(user: another_user)
+
+        get journey_path(journey)
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end
diff --git a/spec/requests/cache_invalidation_spec.rb b/spec/requests/cache_invalidation_spec.rb
new file mode 100644
index 000000000..4075ccab4
--- /dev/null
+++ b/spec/requests/cache_invalidation_spec.rb
@@ -0,0 +1,58 @@
+require "rails_helper"
+
+RSpec.describe "Cache invalidation", type: :request do
+  around do |example|
+    ClimateControl.modify(
+      CONTENTFUL_WEBHOOK_API_KEY: "an API key"
+    ) do
+      example.run
+    end
+  end
+
+  it "removes any matching entry ID from the cache" do
+    RedisCache.redis.set("contentful:entry:6zeSz4F4YtD66gT5SFpnSB", "a dummy value")
+
+    fake_contentful_webook_payload = {
+      "entityId": "6zeSz4F4YtD66gT5SFpnSB",
+      "spaceId": "rwl7tyzv9sys",
+      "parameters": {
+        "text": "Entity version: 62"
+      }
+    }
+
+    headers = {"HTTP_AUTHORIZATION" => ActionController::HttpAuthentication::Basic
+      .encode_credentials("api", ENV["CONTENTFUL_WEBHOOK_API_KEY"])}
+
+    post "/api/contentful/entry_updated", {
+      params: fake_contentful_webook_payload,
+      headers: headers,
+      as: :json
+    }
+
+    expect(response).to have_http_status(:ok)
+    expect(RedisCache.redis.get("contentful:entry:6zeSz4F4YtD66gT5SFpnSB")).to eq(nil)
+  end
+
+  context "when no basic auth was provided" do
+    it "does not delete anything from the cache and returns 401" do
+      RedisCache.redis.set("contentful:entry:6zeSz4F4YtD66gT5SFpnSB", "a dummy value")
+
+      fake_contentful_webook_payload = {
+        "entityId": "6zeSz4F4YtD66gT5SFpnSB",
+        "spaceId": "rwl7tyzv9sys",
+        "parameters": {
+          "text": "Entity version: 62"
+        }
+      }
+
+      # No basic auth
+      post "/api/contentful/entry_updated",
+        params: fake_contentful_webook_payload,
+        as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+      expect(RedisCache.redis.get("contentful:entry:6zeSz4F4YtD66gT5SFpnSB"))
+        .to eq("a dummy value")
+    end
+  end
+end
diff --git a/spec/requests/contentful_caching_spec.rb b/spec/requests/contentful_caching_spec.rb
index c96a38676..5cfe49bae 100644
--- a/spec/requests/contentful_caching_spec.rb
+++ b/spec/requests/contentful_caching_spec.rb
@@ -1,59 +1,73 @@
 require "rails_helper"
 
 RSpec.describe "Contentful Caching", type: :request do
+  before { user_is_signed_in }
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_ENTRY_CACHING: "true"
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
   end
 
-  it "checks the Redis cache instead of making an external request" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
-
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/radio-question-example.json")
-    RedisCache.redis.set("contentful:entry:contentful-radio-question", JSON.dump(raw_response))
+  context "when caching is enabled" do
+    around do |example|
+      ClimateControl.modify(
+        CONTENTFUL_ENTRY_CACHING: "true"
+      ) do
+        example.run
+      end
+    end
+    after(:each) { RedisCache.redis.flushdb }
 
-    expect_any_instance_of(Contentful::Client).not_to receive(:entry)
+    it "checks the Redis cache instead of making an external request" do
+      # TODO: In reality we do not cache categories, but should
+      raw_category_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/radio-question.json")
+      RedisCache.redis.set("contentful:entry:contentful-category-entry", JSON.dump(raw_category_response))
 
-    get new_journey_step_path(journey)
+      # TODO: In reality we do not cache sections, but should
+      raw_section_response = File.read("#{Rails.root}/spec/fixtures/contentful/sections/radio-section.json")
+      RedisCache.redis.set("contentful:entry:radio-section", JSON.dump(raw_section_response))
 
-    expect(response).to have_http_status(:found)
+      raw_step_response = File.read("#{Rails.root}/spec/fixtures/contentful/steps/radio-question.json")
+      RedisCache.redis.set("contentful:entry:radio-question", JSON.dump(raw_step_response))
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
-  end
+      expect_any_instance_of(Contentful::Client).not_to receive(:entry)
 
-  it "stores the external contentful response in the cache" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
-    stub_get_contentful_entry(
-      entry_id: "contentful-radio-question",
-      fixture_filename: "radio-question-example.json"
-    )
+      get new_journey_path
 
-    get new_journey_step_path(journey)
+      expect(response).to have_http_status(:found)
 
-    expect(RedisCache.redis.get("contentful:entry:contentful-radio-question"))
-      .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"contentful-radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}]}}\"")
+      RedisCache.redis.del("contentful:entry:radio-question")
+    end
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
-  end
+    it "stores the external contentful response in the cache" do
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
+      )
 
-  it "sets a TTL to 72 hours by default" do
-    journey = create(:journey, next_entry_id: "contentful-radio-question")
-    stub_get_contentful_entry(
-      entry_id: "contentful-radio-question",
-      fixture_filename: "radio-question-example.json"
-    )
+      get new_journey_path
 
-    freeze_time do
-      get new_journey_step_path(journey)
+      expect(RedisCache.redis.get("contentful:entry:radio-question"))
+        .to eq("\"{\\\"sys\\\":{\\\"space\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Space\\\",\\\"id\\\":\\\"jspwts36h1os\\\"}},\\\"id\\\":\\\"radio-question\\\",\\\"type\\\":\\\"Entry\\\",\\\"createdAt\\\":\\\"2020-09-07T10:56:40.585Z\\\",\\\"updatedAt\\\":\\\"2020-09-14T22:16:54.633Z\\\",\\\"environment\\\":{\\\"sys\\\":{\\\"id\\\":\\\"master\\\",\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"Environment\\\"}},\\\"revision\\\":7,\\\"contentType\\\":{\\\"sys\\\":{\\\"type\\\":\\\"Link\\\",\\\"linkType\\\":\\\"ContentType\\\",\\\"id\\\":\\\"question\\\"}},\\\"locale\\\":\\\"en-US\\\"},\\\"fields\\\":{\\\"slug\\\":\\\"/which-service\\\",\\\"title\\\":\\\"Which service do you need?\\\",\\\"helpText\\\":\\\"Tell us which service you need.\\\",\\\"type\\\":\\\"radios\\\",\\\"extendedOptions\\\":[{\\\"value\\\":\\\"Catering\\\"},{\\\"value\\\":\\\"Cleaning\\\"}],\\\"alwaysShowTheUser\\\":true}}\"")
 
-      expect(RedisCache.redis.ttl("contentful:entry:contentful-radio-question"))
-        .to eq(60 * 60 * 72)
+      RedisCache.redis.del("contentful:entry:radio-question")
     end
 
-    RedisCache.redis.del("contentful:entry:contentful-radio-question")
+    it "sets a TTL to 72 hours by default" do
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
+      )
+
+      freeze_time do
+        get new_journey_path
+
+        expect(RedisCache.redis.ttl("contentful:entry:radio-question"))
+          .to eq(60 * 60 * 72)
+      end
+
+      RedisCache.redis.del("contentful:entry:radio-question")
+    end
   end
 
   context "when caching has been disabled in ENV" do
@@ -66,15 +80,13 @@
     end
 
     it "does not interact with the redis cache" do
-      journey = create(:journey, next_entry_id: "contentful-radio-question")
-      stub_get_contentful_entry(
-        entry_id: "contentful-radio-question",
-        fixture_filename: "radio-question-example.json"
+      stub_contentful_category(
+        fixture_filename: "radio-question.json"
       )
 
       expect(RedisCache).not_to receive(:redis)
 
-      get new_journey_step_path(journey)
+      get new_journey_path
     end
   end
 end
diff --git a/spec/requests/entry_preview_spec.rb b/spec/requests/entry_preview_spec.rb
index 916e3b7cd..8a4c99add 100644
--- a/spec/requests/entry_preview_spec.rb
+++ b/spec/requests/entry_preview_spec.rb
@@ -1,15 +1,17 @@
 require "rails_helper"
 
 RSpec.describe "Entry previews", type: :request do
+  before { user_is_signed_in }
+
   it "creates a dummy journey and redirects to the question creation flow" do
     entry_id = "123"
     fake_journey = create(:journey)
     expect(Journey).to receive(:create)
-      .with(category: anything)
+      .with(category: anything, user: anything, liquid_template: anything)
       .and_return(fake_journey)
 
     fake_get_contentful_entry = instance_double(Contentful::Entry)
-    allow_any_instance_of(GetContentfulEntry).to receive(:call)
+    allow_any_instance_of(GetEntry).to receive(:call)
       .and_return(fake_get_contentful_entry)
 
     fake_step = create(:step, :radio)
diff --git a/spec/services/answer_factory_spec.rb b/spec/services/answer_factory_spec.rb
index 05e16c883..1bc49b48f 100644
--- a/spec/services/answer_factory_spec.rb
+++ b/spec/services/answer_factory_spec.rb
@@ -2,6 +2,15 @@
 
 RSpec.describe AnswerFactory do
   describe "#call" do
+    context "when the step is for an unknown question type" do
+      it "raises an unexpected question type error" do
+        step = create(:step, options: nil, contentful_model: "question", contentful_type: "telepathy")
+        expect {
+          described_class.new(step: step).call
+        }.to raise_error(AnswerFactory::UnexpectedQuestionType)
+      end
+    end
+
     context "when the step is for radios" do
       it "returns a new RadioAnswer object" do
         step = create(:step, :radio)
@@ -26,4 +35,20 @@
       end
     end
   end
+
+  context "when the step is for number" do
+    it "returns a new NumberAnswer object" do
+      step = create(:step, :number)
+      result = described_class.new(step: step).call
+      expect(result).to be_kind_of(NumberAnswer)
+    end
+  end
+
+  context "when the step is for currency" do
+    it "returns a new CurrencyAnswer object" do
+      step = create(:step, :currency)
+      result = described_class.new(step: step).call
+      expect(result).to be_kind_of(CurrencyAnswer)
+    end
+  end
 end
diff --git a/spec/services/build_journey_order_spec.rb b/spec/services/build_journey_order_spec.rb
deleted file mode 100644
index e00600fb3..000000000
--- a/spec/services/build_journey_order_spec.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require "rails_helper"
-
-RSpec.describe BuildJourneyOrder do
-  describe "#call" do
-    around do |example|
-      ClimateControl.modify(
-        CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-      ) do
-        example.run
-      end
-    end
-
-    context "when the journey includes a node which doesn't exist" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "fake-id"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event" do
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "repeat-entry-example.json"
-        )
-
-        expect(Rollbar).to receive(:error)
-          .with("A specified Contentful entry was not found",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "fake-id")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "fake-id"
-          ).call
-        }.to raise_error(BuildJourneyOrder::MissingEntryDetected)
-      end
-    end
-
-    context "when the journey visits the same node twice" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event" do
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "repeat-entry-example.json"
-        )
-
-        expect(Rollbar).to receive(:error)
-          .with("A repeated Contentful entry was found in the same journey",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "contentful-starting-step")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "contentful-starting-step"
-          ).call
-        }.to raise_error(BuildJourneyOrder::RepeatEntryDetected)
-      end
-    end
-
-    context "when the journey visits more than the maximum permitted number of entries" do
-      around do |example|
-        ClimateControl.modify(
-          CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
-        ) do
-          example.run
-        end
-      end
-
-      it "raises a rollbar event with the last entry" do
-        # Creating 50 linked entries in a fixture slows the test suite down
-        # We assume these 50 entries are chained together in a linear sequence.
-        fake_entries = fake_contentful_entry_array(
-          contentful_fixture_filename: "closed-path-with-multiple-example.json"
-        )
-        expect(BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH).to eq(50)
-        stub_const("BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH", 1)
-
-        expect(Rollbar).to receive(:error)
-          .with("More than #{BuildJourneyOrder::ENTRY_JOURNEY_MAX_LENGTH} steps were found in a journey map",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "contentful-radio-question")
-          .and_call_original
-
-        expect {
-          described_class.new(
-            entries: fake_entries,
-            starting_entry_id: "contentful-starting-step"
-          ).call
-        }.to raise_error(BuildJourneyOrder::TooManyChainedEntriesDetected)
-      end
-    end
-  end
-end
diff --git a/spec/services/cache_spec.rb b/spec/services/cache_spec.rb
index e8c473adc..7a6c20ad3 100644
--- a/spec/services/cache_spec.rb
+++ b/spec/services/cache_spec.rb
@@ -85,6 +85,39 @@
     end
   end
 
+  describe ".delete" do
+    context "when the key exists" do
+      it "removes the key from redis and returns nil" do
+        redis = RedisCache.redis
+        allow(RedisCache).to receive(:redis).and_return(redis)
+
+        target_key = "a-key:that-exists"
+        redis.set(target_key, "a-dummy-value")
+
+        expect(redis).to receive(:del).with(target_key).and_call_original
+
+        described_class.delete(key: target_key)
+
+        expect(redis.get(target_key)).to eq(nil)
+      end
+    end
+
+    context "when the key doesn't already exist" do
+      it "returns nil" do
+        redis = RedisCache.redis
+        allow(RedisCache).to receive(:redis).and_return(redis)
+
+        target_key = "a-key:that-does-not-exist"
+
+        expect(redis).to receive(:del).with(target_key).and_call_original
+
+        described_class.delete(key: target_key)
+
+        expect(redis.get(target_key)).to eq(nil)
+      end
+    end
+  end
+
   describe "#extend_ttl_on_all_entries" do
     it "only updates redis keys associated to contentful entries" do
       cache = described_class.new(enabled: anything, ttl: anything)
diff --git a/spec/services/create_journey_spec.rb b/spec/services/create_journey_spec.rb
index 7e1259b02..4fda6cdaf 100644
--- a/spec/services/create_journey_spec.rb
+++ b/spec/services/create_journey_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe CreateJourney do
   around do |example|
     ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: "contentful-starting-step"
+      CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID: "contentful-category-entry"
     ) do
       example.run
     end
@@ -11,30 +11,79 @@
 
   describe "#call" do
     it "creates a new journey" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "closed-path-with-multiple-example.json"
+      stub_contentful_category(
+        fixture_filename: "category-with-no-steps.json",
+        stub_steps: false
       )
-      expect { described_class.new(category: "catering").call }
+      expect { described_class.new(category_name: "catering", user: build(:user)).call }
         .to change { Journey.count }.by(1)
       expect(Journey.last.category).to eql("catering")
     end
 
+    it "associates the new journey with the given user" do
+      stub_contentful_category(
+        fixture_filename: "category-with-no-steps.json",
+        stub_steps: false
+      )
+      user = create(:user)
+
+      described_class.new(category_name: "catering", user: user).call
+
+      expect(Journey.last.user).to eq(user)
+    end
+
     it "stores a copy of the Liquid template" do
-      stub_get_contentful_entries(
-        entry_id: "contentful-starting-step",
-        fixture_filename: "closed-path-with-multiple-example.json"
+      stub_contentful_category(
+        fixture_filename: "category-with-liquid-template.json"
       )
-      fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/basic_catering.liquid")
-      finder = instance_double(FindLiquidTemplate)
-      allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-        .and_return(finder)
-      allow(finder).to receive(:call).and_return(fake_liquid_template)
 
-      described_class.new(category: "catering").call
+      described_class.new(category_name: "catering", user: build(:user)).call
 
       expect(Journey.last.liquid_template)
-        .to eql("<article id=\"specification\">\n  {% if answer_contentful-starting-step %}\n    <section>\n      <p class=\"govuk-body\">I'm the first article and should be seen</p>\n    </section>\n  {% endif %}\n</article>\n")
+        .to eql("<article id='specification'><h1>Liquid {{templating}}</h1></article>")
+    end
+
+    it "stores the section grouping on the journey in the expected order" do
+      stub_contentful_category(
+        fixture_filename: "multiple-sections-and-steps.json"
+      )
+
+      described_class.new(category_name: "catering", user: build(:user)).call
+
+      journey = Journey.last
+
+      expect(journey.reload.section_groups).to eq([
+        {
+          "order" => 0,
+          "title" => "Section A",
+          "steps" => [
+            {"contentful_id" => "radio-question", "order" => 0},
+            {"contentful_id" => "single-date-question", "order" => 1}
+          ]
+        },
+        {
+          "order" => 1,
+          "title" => "Section B",
+          "steps" => [
+            {"contentful_id" => "long-text-question", "order" => 0},
+            {"contentful_id" => "short-text-question", "order" => 1}
+          ]
+        }
+      ])
+    end
+
+    context "when the journey cannot be saved" do
+      it "raises an error" do
+        stub_contentful_category(
+          fixture_filename: "category-with-liquid-template.json",
+          stub_sections: true,
+          stub_steps: false
+        )
+
+        # Force a validation error by not providing a category_name
+        expect { described_class.new(category_name: nil, user: build(:user)).call }
+          .to raise_error(ActiveRecord::RecordInvalid)
+      end
     end
   end
 end
diff --git a/spec/services/create_journey_step_spec.rb b/spec/services/create_journey_step_spec.rb
index f6198446e..b13bbe57f 100644
--- a/spec/services/create_journey_step_spec.rb
+++ b/spec/services/create_journey_step_spec.rb
@@ -5,25 +5,28 @@
     context "when the new step is of type step" do
       it "creates a local copy of the new step" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "radio-question-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/radio-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
 
         expect(step.title).to eq("Which service do you need?")
         expect(step.help_text).to eq("Tell us which service you need.")
-        expect(step.contentful_id).to eq("contentful-radio-question")
+        expect(step.contentful_id).to eq("radio-question")
         expect(step.contentful_model).to eq("question")
         expect(step.contentful_type).to eq("radios")
         expect(step.options).to eq([{"value" => "Catering"}, {"value" => "Cleaning"}])
+        expect(step.hidden).to eq(false)
+        expect(step.additional_step_rules).to eq(nil)
         expect(step.raw).to eq(
           "fields" => {
             "helpText" => "Tell us which service you need.",
             "extendedOptions" => [{"value" => "Catering"}, {"value" => "Cleaning"}],
             "slug" => "/which-service",
             "title" => "Which service do you need?",
-            "type" => "radios"
+            "type" => "radios",
+            "alwaysShowTheUser" => true
           },
           "sys" => {
             "contentType" => {
@@ -41,7 +44,7 @@
                 "type" => "Link"
               }
             },
-            "id" => "contentful-radio-question",
+            "id" => "radio-question",
             "locale" => "en-US",
             "revision" => 7,
             "space" => {
@@ -56,24 +59,13 @@
           }
         )
       end
-
-      it "updates the journey with a new next_entry_id" do
-        journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "has-next-question-example.json"
-        )
-
-        _step = described_class.new(journey: journey, contentful_entry: fake_entry).call
-
-        expect(journey.next_entry_id).to eql("5lYcZs1ootDrOnk09LDLZg")
-      end
     end
 
     context "when the question is of type 'short_text'" do
       it "sets help_text and options to nil" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "short-text-question-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/short-text-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
@@ -83,8 +75,8 @@
 
       it "replaces spaces with underscores" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "short-text-question-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/short-text-question.json"
         )
 
         step = described_class.new(journey: journey, contentful_entry: fake_entry).call
@@ -93,24 +85,11 @@
       end
     end
 
-    context "when the new step does not have a following step" do
-      it "updates the journey by setting the next_entry_id to nil" do
-        journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "radio-question-example.json"
-        )
-
-        _step = described_class.new(journey: journey, contentful_entry: fake_entry).call
-
-        expect(journey.next_entry_id).to eql(nil)
-      end
-    end
-
     context "when the new entry has a body field" do
       it "updates the step with the body" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "static-content-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/static-content.json"
         )
 
         step, _answer = described_class.new(
@@ -127,8 +106,8 @@
     context "when the new entry has a 'primaryCallToAction' field" do
       it "updates the step with the body" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "primary-button-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/primary-button.json"
         )
 
         step, _answer = described_class.new(
@@ -142,8 +121,8 @@
     context "when no 'primaryCallToAction' is provided" do
       it "default copy is used for the button" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "no-primary-button-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/no-primary-button.json"
         )
 
         step, _answer = described_class.new(
@@ -154,11 +133,61 @@
       end
     end
 
+    context "when no 'skipCallToAction' is provided" do
+      it "default copy is used for the button" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/skippable-checkboxes-question.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.skip_call_to_action_text).to eq("None of the above")
+      end
+    end
+
+    context "when no 'alwaysShowTheUser' is provided" do
+      it "default hidden to true" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/no-hidden-field.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.hidden).to eq(false)
+      end
+    end
+
+    context "when 'showAdditionalQuestion' is provided" do
+      it "stores the rule as JSON" do
+        journey = create(:journey, :catering)
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/show-one-additional-question.json"
+        )
+
+        step, _answer = described_class.new(
+          journey: journey, contentful_entry: fake_entry
+        ).call
+
+        expect(step.additional_step_rules).to eql([
+          {
+            "required_answer" => "School expert",
+            "question_identifiers" => ["hidden-field-that-shows-an-additional-question"]
+          }
+        ])
+      end
+    end
+
     context "when the new entry has an unexpected content model" do
       it "raises an error" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-model-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
         expect { described_class.new(journey: journey, contentful_entry: fake_entry).call }
@@ -168,8 +197,8 @@
       it "raises a rollbar event" do
         journey = create(:journey, :catering)
 
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-model-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/unexpected-contentful-type.json"
         )
 
         expect(Rollbar).to receive(:warning)
@@ -177,8 +206,8 @@
             contentful_url: ENV["CONTENTFUL_URL"],
             contentful_space_id: ENV["CONTENTFUL_SPACE"],
             contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "6EKsv389ETYcQql3htK3Z2",
-            content_model: "unmanagedPage",
+            contentful_entry_id: "unexpected-contentful-type",
+            content_model: "telepathy",
             step_type: "radios",
             allowed_content_models: CreateJourneyStep::ALLOWED_CONTENTFUL_MODELS.join(", "),
             allowed_step_types: CreateJourneyStep::ALLOWED_CONTENTFUL_ENTRY_TYPES.join(", "))
@@ -191,8 +220,8 @@
     context "when the new step has an unexpected step type" do
       it "raises an error" do
         journey = create(:journey, :catering)
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-question-type-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
         expect { described_class.new(journey: journey, contentful_entry: fake_entry).call }
@@ -202,8 +231,8 @@
       it "raises a rollbar event" do
         journey = create(:journey, :catering)
 
-        fake_entry = fake_contentful_entry(
-          contentful_fixture_filename: "an-unexpected-question-type-example.json"
+        fake_entry = fake_contentful_step(
+          contentful_fixture_filename: "steps/unexpected-contentful-question-type.json"
         )
 
         expect(Rollbar).to receive(:warning)
@@ -211,7 +240,7 @@
             contentful_url: ENV["CONTENTFUL_URL"],
             contentful_space_id: ENV["CONTENTFUL_SPACE"],
             contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            contentful_entry_id: "8as7df68uhasdnuasdf",
+            contentful_entry_id: "unexpected-contentful-question-type",
             content_model: "question",
             step_type: "telepathy",
             allowed_content_models: CreateJourneyStep::ALLOWED_CONTENTFUL_MODELS.join(", "),
diff --git a/spec/services/find_liquid_template_spec.rb b/spec/services/find_liquid_template_spec.rb
deleted file mode 100644
index 135ddbb6a..000000000
--- a/spec/services/find_liquid_template_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require "rails_helper"
-
-RSpec.describe FindLiquidTemplate do
-  describe "#call" do
-    context "when the Liquid contents are invalid (using the gems own parser)" do
-      it "raises an error" do
-        fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-
-        finder = described_class.new(category: "catering")
-        allow(finder).to receive(:file).and_return(fake_liquid_template)
-
-        expect { finder.call }.to raise_error(FindLiquidTemplate::InvalidLiquidSyntax)
-      end
-
-      it "sends an error to rollbar" do
-        fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/invalid.liquid")
-
-        finder = described_class.new(category: "catering")
-        allow(finder).to receive(:file).and_return(fake_liquid_template)
-
-        expect(Rollbar).to receive(:error)
-          .with("A user couldn't start a journey because of an invalid Specification",
-            contentful_url: ENV["CONTENTFUL_URL"],
-            contentful_space_id: ENV["CONTENTFUL_SPACE"],
-            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
-            category: "catering").and_call_original
-
-        expect { finder.call }.to raise_error(FindLiquidTemplate::InvalidLiquidSyntax)
-      end
-    end
-
-    context "when in development" do
-      it "loads the development liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.development.liquid").at_least(:once)
-        described_class.new(category: category, environment: "development").call
-      end
-    end
-
-    context "when in staging" do
-      it "loads the staging liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.staging.liquid").at_least(:once)
-        described_class.new(category: category, environment: "staging").call
-      end
-    end
-
-    context "when in production" do
-      it "loads the production liquid template" do
-        category = "catering"
-        expect(File).to receive(:read).with("lib/specification_templates/#{category}.production.liquid").at_least(:once)
-        described_class.new(category: category, environment: "production").call
-      end
-    end
-  end
-end
diff --git a/spec/services/find_or_create_user_from_session_spec.rb b/spec/services/find_or_create_user_from_session_spec.rb
new file mode 100644
index 000000000..44f9007a9
--- /dev/null
+++ b/spec/services/find_or_create_user_from_session_spec.rb
@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe FindOrCreateUserFromSession do
+  describe "#call" do
+    context "when a user exists with this DfE Sign-in UID" do
+      it "returns the user record" do
+        user = create(:user, dfe_sign_in_uid: "03f98d51-5a93-4caa-9ff2-07faff7351d2")
+        session_hash = {"dfe_sign_in_uid" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
+        result = described_class.new(session_hash: session_hash).call
+        expect(result).to eq(user)
+      end
+    end
+
+    context "when a user doesn't exist with this DfE Sign-in UID" do
+      it "creates a new user record" do
+        session_hash = {"dfe_sign_in_uid" => "an-unknown-uuid"}
+        result = described_class.new(session_hash: session_hash).call
+        user = User.find_by(dfe_sign_in_uid: "an-unknown-uuid")
+        expect(result).to eq(user)
+      end
+    end
+
+    context "when the session_hash does not include an expected key" do
+      it "returns nil" do
+        session_hash = {"unexpected-key" => "03f98d51-5a93-4caa-9ff2-07faff7351d2"}
+        result = described_class.new(session_hash: session_hash).call
+        expect(result).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/spec/services/get_answers_for_steps_spec.rb b/spec/services/get_answers_for_steps_spec.rb
new file mode 100644
index 000000000..096b61533
--- /dev/null
+++ b/spec/services/get_answers_for_steps_spec.rb
@@ -0,0 +1,209 @@
+require "rails_helper"
+
+RSpec.describe GetAnswersForSteps do
+  describe "#call" do
+    it "only returns answers for the given journey" do
+      relevant_answer = create(:short_text_answer, response: "Red")
+      irrelevant_answer = create(:short_text_answer, response: "Blue")
+
+      result = described_class.new(visible_steps: [relevant_answer.step]).call
+
+      expect(result).to be_a(Hash)
+      expect(result).to include(
+        {"answer_#{relevant_answer.step.contentful_id}" => {response: "Red"}}
+      )
+      expect(result).not_to include(
+        {"answer_#{irrelevant_answer.step.contentful_id}" => {response: "Blue"}}
+      )
+    end
+
+    it "returns a hash with_indifferent_access so Liquid can use the string syntax for access" do
+      answer = create(:short_text_answer, response: "Red")
+      result = described_class.new(visible_steps: [answer.step]).call
+      expect(result).to include({"answer_#{answer.step.contentful_id}" => {"response" => "Red"}})
+    end
+
+    context "when the answer is of type short_text_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:short_text_answer, response: "Red")
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "Red"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type long_text_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:long_text_answer, response: "Red\r\n\r\n\r\nBlue")
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "<p>Red</p>\n\n<p>Blue</p>"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type single_date_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:single_date_answer, response: Date.new(2000, 12, 30))
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "30 Dec 2000"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type radio_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:radio_answer,
+          response: "Yes please",
+          further_information: {yes_please_further_information: "More yes info"})
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "Yes please",
+            further_information: "More yes info"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type currency_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:currency_answer, response: 100.01)
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "£100.01"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type number_answer" do
+      it "returns the answer information in a hash" do
+        answer = create(:number_answer, response: 2)
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: "2"
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+    end
+
+    context "when the answer is of type checkbox_answers" do
+      it "returns the answer information in a hash" do
+        answer = create(:checkbox_answers,
+          response: ["Foo", "Bar"],
+          skipped: false,
+          further_information: {"foo_further_information" => "More yes info"})
+
+        result = described_class.new(visible_steps: [answer.step]).call
+        assertion = {
+          "answer_#{answer.step.contentful_id}" => {
+            response: ["Foo", "Bar"],
+            concatenated_response: "Foo, Bar",
+            skipped: false,
+            selected_answers: [
+              {
+                machine_value: :foo,
+                human_value: "Foo",
+                further_information: "More yes info"
+              },
+              {
+                machine_value: :bar,
+                human_value: "Bar",
+                further_information: nil
+              }
+            ]
+          }
+        }
+
+        expect(result).to match(a_hash_including(assertion))
+      end
+
+      context "when there is no further_information at all" do
+        it "returns no further_information in selected_answers" do
+          answer = create(:checkbox_answers,
+            response: ["Foo"],
+            skipped: false,
+            further_information: nil)
+
+          result = described_class.new(visible_steps: [answer.step]).call
+          assertion = {
+            "answer_#{answer.step.contentful_id}" => {
+              response: ["Foo"],
+              concatenated_response: "Foo",
+              skipped: false,
+              selected_answers: [
+                {
+                  machine_value: :foo,
+                  human_value: "Foo",
+                  further_information: nil
+                }
+              ]
+            }
+          }
+
+          expect(result).to match(a_hash_including(assertion))
+        end
+      end
+    end
+
+    context "when a step does not have an answer" do
+      it "the step does not have an answer in the result" do
+        unanswered_step = create(:step, :radio)
+        result = described_class.new(visible_steps: [unanswered_step]).call
+        expect(result.keys).not_to include("answer_#{unanswered_step.contentful_id}")
+      end
+    end
+
+    context "when the type of answer is unknown" do
+      it "raises an unexpected error" do
+        allow_any_instance_of(Step).to receive(:answer)
+          .and_return(double(class: double(name: "UnknownClass")))
+        step = create(:step, :radio)
+        expect {
+          described_class.new(visible_steps: [step]).call
+        }.to raise_error(GetAnswersForSteps::UnexpectedAnswer)
+      end
+    end
+
+    context "when there is no answer for a step" do
+      it "does not try to prepare that answer in the result" do
+        journey = create(:journey)
+        answerable_step = create(:step, :radio, journey: journey)
+        _answer = create(:radio_answer, step: answerable_step)
+        unanswerable_step = create(:step, :radio, journey: journey)
+
+        result = described_class.new(visible_steps: [answerable_step]).call
+
+        expect(result.keys).to include("answer_#{answerable_step.contentful_id}")
+        expect(result.keys).not_to include("answer_#{unanswerable_step.contentful_id}")
+      end
+    end
+  end
+end
diff --git a/spec/services/get_category_spec.rb b/spec/services/get_category_spec.rb
new file mode 100644
index 000000000..d63dce078
--- /dev/null
+++ b/spec/services/get_category_spec.rb
@@ -0,0 +1,63 @@
+require "rails_helper"
+
+RSpec.describe GetCategory do
+  describe "#call" do
+    it "returns a Contenetful::Entry for the category_entry_id" do
+      stub_contentful_category(
+        fixture_filename: "static-content.json",
+        stub_sections: false
+      )
+      result = described_class.new(category_entry_id: "contentful-category-entry").call
+      expect(result.id).to eql("contentful-category-entry")
+    end
+
+    context "when the category entry cannot be found" do
+      it "sends a message to rollbar" do
+        contentful_connector = instance_double(ContentfulConnector)
+        expect(ContentfulConnector).to receive(:new)
+          .and_return(contentful_connector)
+
+        allow(contentful_connector).to receive(:get_entry_by_id)
+          .with(anything)
+          .and_return(nil)
+
+        expect(Rollbar).to receive(:error)
+          .with("A Contentful category entry was not found",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "a-category-id-that-does-not-exist")
+          .and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "a-category-id-that-does-not-exist").call
+        }.to raise_error(GetEntry::EntryNotFound)
+      end
+    end
+
+    context "when the Liquid contents are invalid (using the gems own parser)" do
+      it "raises an error" do
+        stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
+
+        expect {
+          described_class.new(category_entry_id: "contentful-category-entry").call
+        }.to raise_error(GetCategory::InvalidLiquidSyntax)
+      end
+
+      it "sends an error to rollbar" do
+        stub_contentful_category(fixture_filename: "category-with-invalid-liquid-template.json")
+
+        expect(Rollbar).to receive(:error)
+          .with("A user couldn't start a journey because of an invalid Specification",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "contentful-category-entry").and_call_original
+
+        expect {
+          described_class.new(category_entry_id: "contentful-category-entry").call
+        }.to raise_error(GetCategory::InvalidLiquidSyntax)
+      end
+    end
+  end
+end
diff --git a/spec/services/get_contentful_entry_spec.rb b/spec/services/get_entry_spec.rb
similarity index 84%
rename from spec/services/get_contentful_entry_spec.rb
rename to spec/services/get_entry_spec.rb
index 4aeaa4729..5e4a796ce 100644
--- a/spec/services/get_contentful_entry_spec.rb
+++ b/spec/services/get_entry_spec.rb
@@ -1,16 +1,8 @@
 require "rails_helper"
 
-RSpec.describe GetContentfulEntry do
+RSpec.describe GetEntry do
   let(:contentful_journey_start_entry_id) { "1a2b3c4d5" }
 
-  around do |example|
-    ClimateControl.modify(
-      CONTENTFUL_PLANNING_START_ENTRY_ID: contentful_journey_start_entry_id
-    ) do
-      example.run
-    end
-  end
-
   describe "#call" do
     it "requests and returns the required entry from Contentful" do
       contentful_connector = instance_double(ContentfulConnector)
@@ -37,7 +29,7 @@
           .and_return(nil)
 
         expect { described_class.new(entry_id: missing_entry_id).call }
-          .to raise_error(GetContentfulEntry::EntryNotFound)
+          .to raise_error(GetEntry::EntryNotFound)
       end
 
       it "raises a rollbar event" do
@@ -55,7 +47,7 @@
             contentful_entry_id: "123")
           .and_call_original
         expect { described_class.new(entry_id: "123").call }
-          .to raise_error(GetContentfulEntry::EntryNotFound)
+          .to raise_error(GetEntry::EntryNotFound)
       end
     end
   end
diff --git a/spec/services/get_sections_from_category_spec.rb b/spec/services/get_sections_from_category_spec.rb
new file mode 100644
index 000000000..33c602b4d
--- /dev/null
+++ b/spec/services/get_sections_from_category_spec.rb
@@ -0,0 +1,16 @@
+require "rails_helper"
+
+RSpec.describe GetSectionsFromCategory do
+  describe "#call" do
+    it "returns an array of sections" do
+      category = stub_contentful_category(
+        fixture_filename: "radio-question.json",
+        stub_steps: false
+      )
+
+      result = described_class.new(category: category).call
+
+      expect(result).to eq(category.sections)
+    end
+  end
+end
diff --git a/spec/services/get_steps_from_section_spec.rb b/spec/services/get_steps_from_section_spec.rb
new file mode 100644
index 000000000..557eb2a53
--- /dev/null
+++ b/spec/services/get_steps_from_section_spec.rb
@@ -0,0 +1,40 @@
+require "rails_helper"
+
+RSpec.describe GetStepsFromSection do
+  describe "#call" do
+    it "returns the list of entry objects referenced by the section list" do
+      section = fake_contentful_section(
+        contentful_fixture_filename: "sections/journey-with-multiple-entries-section.json"
+      )
+      stub_contentful_section_steps(sections: [section])
+
+      result = described_class.new(section: section).call
+
+      expect(result).to be_kind_of(Array)
+      # INFO: We should test this is a Contentful::Entry however it wasn't
+      # possible to create an instance_double due to an unusual way the object
+      # is constructed within the gem. Creating the object seems overly complex.
+      expect(result.first.id).to eq("radio-question")
+    end
+
+    context "when the same entry is found twice" do
+      it "returns an error message" do
+        section = fake_contentful_section(
+          contentful_fixture_filename: "sections/journey-with-repeat-entries-section.json"
+        )
+
+        expect(Rollbar).to receive(:error)
+          .with("A repeated Contentful entry was found in the same section",
+            contentful_url: ENV["CONTENTFUL_URL"],
+            contentful_space_id: ENV["CONTENTFUL_SPACE"],
+            contentful_environment: ENV["CONTENTFUL_ENVIRONMENT"],
+            contentful_entry_id: "radio-question")
+          .and_call_original
+
+        expect {
+          described_class.new(section: section).call
+        }.to raise_error(GetStepsFromSection::RepeatEntryDetected)
+      end
+    end
+  end
+end
diff --git a/spec/services/save_answer_spec.rb b/spec/services/save_answer_spec.rb
new file mode 100644
index 000000000..086e81576
--- /dev/null
+++ b/spec/services/save_answer_spec.rb
@@ -0,0 +1,72 @@
+require "rails_helper"
+
+RSpec.describe SaveAnswer do
+  describe "#call" do
+    it "updates the answer with the answer_params" do
+      answer = create(:short_text_answer)
+      params = ActionController::Parameters.new(response: "A little text").permit!
+
+      result = described_class.new(answer: answer).call(answer_params: params)
+
+      expect(result.success?).to eql(true)
+      expect(result.object.response).to eql("A little text")
+    end
+
+    it "checks to see if any other steps need to be updated" do
+      answer = create(:short_text_answer)
+
+      toggle_service = instance_double(ToggleAdditionalSteps)
+      expect(ToggleAdditionalSteps).to receive(:new).with(step: answer.step).and_return(toggle_service)
+      expect(toggle_service).to receive(:call)
+
+      described_class.new(answer: answer).call(answer_params: {})
+    end
+
+    context "when the step is a checkbox question" do
+      it "updates the answer with the checkbox_params" do
+        answer = create(:checkbox_answers)
+        params = ActionController::Parameters.new(response: ["A", "B"]).permit!
+
+        result = described_class.new(answer: answer).call(further_information_params: params)
+
+        expect(result.success?).to eql(true)
+        expect(result.object.response).to eql(["A", "B"])
+      end
+    end
+
+    context "when the step is a date question" do
+      it "updates the answer with the date_params" do
+        answer = build(:single_date_answer, response: nil)
+        date = Date.new(2000, 1, 29)
+        params = {response: date}
+
+        result = described_class.new(answer: answer).call(date_params: params)
+
+        expect(result.success?).to eql(true)
+        expect(result.object.response).to eql(date)
+      end
+    end
+
+    context "when the answer is invalid" do
+      it "does not try to save the answer" do
+        answer = create(:checkbox_answers)
+
+        allow(answer).to receive(:valid?).and_return(false)
+        expect(answer).not_to receive(:save)
+
+        described_class.new(answer: answer).call(answer_params: {})
+      end
+
+      it "returns a failed result" do
+        answer = create(:short_text_answer)
+        params = ActionController::Parameters.new(response: "A").permit!
+
+        allow(answer).to receive(:valid?).and_return(false)
+
+        result = described_class.new(answer: answer).call(answer_params: params)
+
+        expect(result.success?).to eql(false)
+      end
+    end
+  end
+end
diff --git a/spec/services/specification_renderer_spec.rb b/spec/services/specification_renderer_spec.rb
new file mode 100644
index 000000000..9c9665be3
--- /dev/null
+++ b/spec/services/specification_renderer_spec.rb
@@ -0,0 +1,45 @@
+require "rails_helper"
+
+RSpec.describe SpecificationRenderer do
+  describe "#to_html" do
+    it "renders a HTML representation of a template given specific answers" do
+      renderer = described_class.new(
+        template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+        answers: {
+          "variable_name" => "variable value"
+        }
+      )
+      expect(renderer.to_html).to eql('<p>HTML paragraph rendering a variable: "variable value"</p>')
+    end
+  end
+
+  describe "#to_document_html" do
+    context "when the journey is complete" do
+      it "renders HTML for use in rendering a docx file" do
+        renderer = described_class.new(
+          template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+          answers: {
+            "variable_name" => "variable value"
+          }
+        )
+        expect(renderer.to_document_html(journey_complete: true))
+          .to eql('<p>HTML paragraph rendering a variable: "variable value"</p>')
+      end
+    end
+
+    context "when the journey is NOT complete" do
+      it "renders HTML with an extra warning for use in rendering a docx file" do
+        renderer = described_class.new(
+          template: '<p>HTML paragraph rendering a variable: "{{ variable_name }}"</p>',
+          answers: {
+            "variable_name" => "variable value"
+          }
+        )
+        warning_html = I18n.t("journey.specification.download.warning.incomplete")
+        common_html = '<p>HTML paragraph rendering a variable: "variable value"</p>'
+        expect(renderer.to_document_html(journey_complete: false))
+          .to eql(warning_html + common_html)
+      end
+    end
+  end
+end
diff --git a/spec/services/toggle_additional_steps_spec.rb b/spec/services/toggle_additional_steps_spec.rb
new file mode 100644
index 000000000..b8af60be1
--- /dev/null
+++ b/spec/services/toggle_additional_steps_spec.rb
@@ -0,0 +1,338 @@
+require "rails_helper"
+
+RSpec.describe ToggleAdditionalSteps do
+  describe "#call" do
+    let(:journey) { create(:journey) }
+
+    context "when the additional_step_rules field is nil" do
+      it "returns nil" do
+        step = build(:step)
+        expect(described_class.new(step: step).call).to eq(nil)
+      end
+    end
+
+    context "when the additional_step_rules exists" do
+      context "when the answers match" do
+        it "only shows the additional steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
+          create(:radio_answer, step: step, response: "Red")
+
+          another_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(another_step_to_show.reload.hidden).to eq(false)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
+        it "shows all additional_steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [{
+              "required_answer" => "Red",
+              "question_identifiers" => ["123", "456"]
+            }])
+          create(:radio_answer, step: step, response: "Red")
+
+          first_additional_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          second_additional_step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "456",
+            hidden: true)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(first_additional_step_to_show.reload.hidden).to eq(false)
+          expect(second_additional_step_to_show.reload.hidden).to eq(false)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
+        context "when the required_answer matches the answer exactly" do
+          it "updates the referenced step's hidden field to false" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
+            create(:radio_answer, step: step, response: "Red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: true)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+
+        context "when the required_answer has different case to the answer" do
+          it "returns the updated step" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rules: [{"required_answer" => "RED", "question_identifiers" => ["123"]}])
+            create(:radio_answer, step: step, response: "red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: true)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+
+        context "when the referenced step also has an additional_step_rules rule" do
+          it "shows both connected questions" do
+            first_step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}],
+              hidden: false)
+            create(:radio_answer, step: first_step, response: "Red")
+
+            second_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifiers" => ["456"]}],
+              hidden: true)
+            create(:radio_answer, step: second_step, response: "Blue")
+
+            third_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "456",
+              hidden: true)
+
+            described_class.new(step: first_step).call
+
+            expect(second_step.reload.hidden).to eq(false)
+            expect(third_step.reload.hidden).to eq(false)
+          end
+        end
+      end
+
+      context "when a branching question has multiple branches itself" do
+        it "should hide itself and all connected branches" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [
+              {"required_answer" => "Red", "question_identifiers" => ["123"]},
+              {"required_answer" => "Blue", "question_identifiers" => ["456"]}
+            ],
+            hidden: false)
+
+          create(:radio_answer, step: step, response: "Blue")
+
+          first_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            additional_step_rules: [
+              {"required_answer" => "Yellow", "question_identifiers" => ["8"]},
+              {"required_answer" => "Green", "question_identifiers" => ["9"]}
+            ],
+            hidden: false)
+
+          second_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "8",
+            additional_step_rules: [],
+            hidden: false)
+
+          third_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "9",
+            additional_step_rules: [],
+            hidden: false)
+
+          described_class.new(step: step).call
+
+          expect(first_step_to_hide.reload.hidden).to eq(true)
+          expect(second_step_to_hide.reload.hidden).to eq(true)
+          expect(third_step_to_hide.reload.hidden).to eq(true)
+        end
+      end
+
+      context "when a branching question is shown based on more than on matching answer" do
+        it "continues to show the next step (rather than hiding it again when it doesn't match the second rule)" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [
+              {"required_answer" => "red", "question_identifiers" => ["123"]},
+              {"required_answer" => "blue", "question_identifiers" => ["123"]}
+            ])
+          create(:radio_answer, step: step, response: "red")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
+      end
+
+      context "when the answers DO NOT match" do
+        it "updates the referenced step's hidden field to true" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
+          create(:radio_answer, step: step, response: "Blue")
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: false)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(true)
+        end
+
+        it "hides all additional_steps within the same journey" do
+          step = create(:step,
+            :radio,
+            journey: journey,
+            additional_step_rules: [{
+              "required_answer" => "Red",
+              "question_identifiers" => ["123", "456"]
+            }])
+          create(:radio_answer, step: step, response: "NOT Red")
+
+          first_additional_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: false)
+
+          second_additional_step_to_hide = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "456",
+            hidden: false)
+
+          another_step_from_a_different_journey_to_keep_hidden = create(:step,
+            :radio,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(first_additional_step_to_hide.reload.hidden).to eq(true)
+          expect(second_additional_step_to_hide.reload.hidden).to eq(true)
+          expect(another_step_from_a_different_journey_to_keep_hidden.reload.hidden).to eq(true)
+        end
+
+        context "when the required_answer has different case to the answer" do
+          it "does not hide the step" do
+            step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rules: [{"required_answer" => "RED", "question_identifiers" => ["123"]}])
+            create(:radio_answer, step: step, response: "red")
+
+            step_to_show = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              hidden: false)
+
+            described_class.new(step: step).call
+
+            expect(step_to_show.reload.hidden).to eq(false)
+          end
+        end
+
+        context "when the referenced step also has an additional_step_rules rule" do
+          it "hides both connected questions" do
+            first_step = create(:step,
+              :radio,
+              journey: journey,
+              additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}],
+              hidden: false)
+            create(:radio_answer, step: first_step, response: "Changed from red")
+
+            second_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "123",
+              additional_step_rules: [{"required_answer" => "Blue", "question_identifiers" => ["456"]}],
+              hidden: false)
+            create(:radio_answer, step: second_step, response: "Blue")
+
+            third_step = create(:step,
+              :radio,
+              journey: journey,
+              contentful_id: "456",
+              hidden: false)
+
+            described_class.new(step: first_step).call
+
+            expect(second_step.reload.hidden).to eq(true)
+            expect(third_step.reload.hidden).to eq(true)
+          end
+        end
+      end
+
+      context "when the answer response is an array" do
+        it "checks for a match against all answers" do
+          step = create(:step,
+            :checkbox_answers,
+            journey: journey,
+            additional_step_rules: [{"required_answer" => "Red", "question_identifiers" => ["123"]}])
+          create(:checkbox_answers, step: step, response: ["Blue", "Red"])
+
+          step_to_show = create(:step,
+            :radio,
+            journey: journey,
+            contentful_id: "123",
+            hidden: true)
+
+          described_class.new(step: step).call
+
+          expect(step_to_show.reload.hidden).to eq(false)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b5c1e182a..a441047b6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -66,7 +66,7 @@
   #   # Allows RSpec to persist some state between runs in order to support
   #   # the `--only-failures` and `--next-failure` CLI options. We recommend
   #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  config.example_status_persistence_file_path = "spec/examples.txt"
   #
   #   # Limits the available syntax to the non-monkey patched syntax that is
   #   # recommended. For more details, see:
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 1c12b61dd..5bda9b575 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-Capybara.asset_host = "http://localhost:3000"
+Capybara.app_host = "http://www.example.com:3000"
+Capybara.asset_host = "http://www.example.com"
diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb
index d9bb11f38..b1edab7c0 100644
--- a/spec/support/contentful_helpers.rb
+++ b/spec/support/contentful_helpers.rb
@@ -1,28 +1,93 @@
 module ContentfulHelpers
-  def stub_get_contentful_entry(
-    entry_id: "contentful-radio-question",
+  def stub_contentful_entry(
+    entry_id: "radio-question",
     fixture_filename: "radio-question-example.json"
   )
     contentful_connector = stub_contentful_connector
-    contentful_response = fake_contentful_entry(contentful_fixture_filename: fixture_filename)
+    contentful_response = fake_contentful_step(contentful_fixture_filename: fixture_filename)
     allow(contentful_connector).to receive(:get_entry_by_id)
       .with(entry_id)
       .and_return(contentful_response)
   end
 
-  def stub_get_contentful_entries(
-    entry_id: "contentful-starting-step",
-    fixture_filename: "multiple-entries-example.json"
+  def stub_contentful_category(
+    fixture_filename:,
+    stub_sections: true,
+    stub_steps: true,
+    contentful_connector: instance_double(ContentfulConnector) # TODO: I suspect the double doesn't do anything and we need stub_contentful_connector
   )
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{fixture_filename}")
+    category = fake_contentful_category(contentful_fixture_filename: fixture_filename)
 
-    contentful_connector = stub_contentful_connector
-    contentful_response = fake_contentful_entry_array(contentful_fixture_filename: fixture_filename)
-    allow(contentful_connector).to receive(:get_all_entries)
-      .and_return(contentful_response)
+    expect(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+
+    allow(contentful_connector).to receive(:get_entry_by_id)
+      .with(category.id)
+      .and_return(category)
+
+    if stub_sections
+      sections = stub_contentful_sections(category: category, contentful_connector: contentful_connector)
+      if stub_steps
+        stub_contentful_section_steps(sections: sections, contentful_connector: contentful_connector)
+      end
+    end
+
+    category
+  end
+
+  def stub_contentful_sections(
+    category:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+
+    fake_sections = category.sections.map { |section|
+      fake_section = fake_contentful_section(contentful_fixture_filename: "sections/#{section.id}.json")
+      expect(contentful_connector).to receive(:get_entry_by_id)
+        .with(fake_section.id)
+        .and_return(fake_section)
+      fake_section
+    }
+
+    allow(category).to receive(:sections).and_return(fake_sections)
+    fake_sections
+  end
+
+  def stub_contentful_section_steps(
+    sections:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
+
+    sections.each do |section|
+      fake_steps = section.steps.map { |step|
+        fake_step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json")
+        expect(contentful_connector).to receive(:get_entry_by_id)
+          .with(fake_step.id)
+          .and_return(fake_step)
+        fake_step
+      }
+      allow(section).to receive(:steps).and_return(fake_steps)
+    end
+  end
+
+  def stub_contentful_category_steps(
+    category:,
+    contentful_connector: instance_double(ContentfulConnector)
+  )
+    return if category.steps.count.zero?
+
+    allow(ContentfulConnector).to receive(:new)
+      .and_return(contentful_connector)
 
-    allow(contentful_response).to receive(:raw)
-      .and_return(raw_response)
+    category.steps.each do |step|
+      step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json")
+      allow(contentful_connector).to receive(:get_entry_by_id)
+        .with(step.id)
+        .and_return(step)
+    end
   end
 
   def stub_contentful_connector
@@ -40,7 +105,35 @@ def stub_contentful_client
     contentful_client
   end
 
-  def fake_contentful_entry(contentful_fixture_filename:)
+  def fake_contentful_category(contentful_fixture_filename:)
+    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/categories/#{contentful_fixture_filename}")
+    hash_response = JSON.parse(raw_response)
+
+    sections = hash_response.dig("fields", "sections").map { |section|
+      double(id: section.dig("sys", "id"))
+    }
+
+    double(
+      Contentful::Entry,
+      id: hash_response.dig("sys", "id"),
+      sections: sections,
+      specification_template: hash_response.dig("fields", "specification_template")
+    )
+  end
+
+  def fake_contentful_section(contentful_fixture_filename:)
+    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
+    hash_response = JSON.parse(raw_response)
+
+    double(
+      Contentful::Entry,
+      id: hash_response.dig("sys", "id"),
+      title: hash_response.dig("fields", "title"),
+      steps: hash_response.dig("fields", "steps").map { |step_hash| double(id: step_hash.dig("sys", "id")) }
+    )
+  end
+
+  def fake_contentful_step(contentful_fixture_filename:)
     raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
     hash_response = JSON.parse(raw_response)
 
@@ -54,15 +147,11 @@ def fake_contentful_entry(contentful_fixture_filename:)
       type: hash_response.dig("fields", "type"),
       next: double(id: hash_response.dig("fields", "next", "sys", "id")),
       primary_call_to_action: hash_response.dig("fields", "primaryCallToAction"),
+      skip_call_to_action: hash_response.dig("fields", "skipCallToAction"),
+      always_show_the_user: hash_response.dig("fields", "alwaysShowTheUser"),
+      show_additional_question: hash_response.dig("fields", "showAdditionalQuestion"),
       raw: hash_response,
       content_type: double(id: hash_response.dig("sys", "contentType", "sys", "id"))
     )
   end
-
-  def fake_contentful_entry_array(contentful_fixture_filename:)
-    raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}")
-    response_hash = JSON.parse(raw_response)
-
-    Contentful::ResourceBuilder.new(response_hash).run
-  end
 end
diff --git a/spec/support/journey_helpers.rb b/spec/support/journey_helpers.rb
new file mode 100644
index 000000000..cce75d329
--- /dev/null
+++ b/spec/support/journey_helpers.rb
@@ -0,0 +1,21 @@
+module JourneyHelpers
+  def click_first_link_in_task_list
+    within("ol.app-task-list") do
+      first("a").click
+    end
+  end
+
+  def start_journey_from_category(category:)
+    stub_contentful_category(
+      fixture_filename: category
+    )
+
+    user_signs_in_and_starts_the_journey
+  end
+
+  def start_journey_from_category_and_go_to_question(category:)
+    start_journey_from_category(category: category)
+
+    click_first_link_in_task_list
+  end
+end
diff --git a/spec/support/liquid_helpers.rb b/spec/support/liquid_helpers.rb
deleted file mode 100644
index 157c1fd33..000000000
--- a/spec/support/liquid_helpers.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module LiquidHelpers
-  def stub_liquid_template(filename: "basic_catering.liquid")
-    fake_liquid_template = File.read("#{Rails.root}/spec/fixtures/specification_templates/#{filename}")
-
-    finder = instance_double(FindLiquidTemplate)
-    allow(FindLiquidTemplate).to receive(:new).with(category: "catering")
-      .and_return(finder)
-    allow(finder).to receive(:call).and_return(fake_liquid_template)
-
-    fake_liquid_template
-  end
-end
diff --git a/spec/support/omniauth.rb b/spec/support/omniauth.rb
new file mode 100644
index 000000000..0b1af4052
--- /dev/null
+++ b/spec/support/omniauth.rb
@@ -0,0 +1 @@
+OmniAuth.config.test_mode = true
diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb
new file mode 100644
index 000000000..4f903547e
--- /dev/null
+++ b/spec/support/sign_in_helpers.rb
@@ -0,0 +1,31 @@
+module SignInHelpers
+  def user_exists_in_dfe_sign_in(dsi_uid: SecureRandom.uuid)
+    OmniAuth.config.mock_auth[:dfe] = OmniAuth::AuthHash.new(
+      uid: dsi_uid,
+      credentials: {
+        id_token: "a-long-secret-given-by-dsi-to-use-to-sign-the-user-out-of-dsi-as-a-whole"
+      }
+    )
+  end
+
+  def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid)
+    OmniAuth.config.mock_auth[:dfe] = :invalid_credentials
+  end
+
+  def user_starts_the_journey
+    visit root_path
+    click_link I18n.t("generic.button.start")
+    click_link I18n.t("dashboard.create.link")
+  end
+
+  def user_signs_in_and_starts_the_journey
+    user_exists_in_dfe_sign_in
+    user_starts_the_journey
+  end
+
+  def user_is_signed_in(user: build(:user))
+    allow_any_instance_of(FindOrCreateUserFromSession)
+      .to receive(:call)
+      .and_return(user)
+  end
+end
diff --git a/terraform/app/.terraform-version b/terraform/app/.terraform-version
new file mode 100644
index 000000000..c24a39598
--- /dev/null
+++ b/terraform/app/.terraform-version
@@ -0,0 +1 @@
+0.14.7
diff --git a/terraform/app/.terraform.lock.hcl b/terraform/app/.terraform.lock.hcl
new file mode 100644
index 000000000..1146b5921
--- /dev/null
+++ b/terraform/app/.terraform.lock.hcl
@@ -0,0 +1,41 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
+  version     = "0.13.0"
+  constraints = "~> 0.13.0"
+  hashes = [
+    "h1:WzvlwIg0cANtlL1banQ4EUetkR7vKMElXDFx/ZXhkAk=",
+    "zh:146277a9fb306f5c10cb385dce356f16174762f6e799456638e5981b8fc9fcde",
+    "zh:254fe911a61acae7352f7f91d2e706db975481124cbb2fa8fce8b367b8becebe",
+    "zh:4b71ab53089b869d9689f44e5c869c83446d6754ccfa9587ae297c62a2070aa5",
+    "zh:51cbc92b6ed5640464633bc37323835a1f3a0888bf98b747ff5736360aa15b7f",
+    "zh:61f40fe915c2b2fe545c0e7d7373ccd49e7af8c4557c8657e1b76b6cd67cb640",
+    "zh:66186073b2086097a2b9ebd902530d8417c5cc17c6d8262991172b2a1309eae4",
+    "zh:a759ec60b39f34e200e7d0da043f8f72a9a39dc091828e9290f683e4129619f4",
+    "zh:acecf99eb8a4a9ccfe1e9ce630b56e9d9117d665aecb3dc81050d438630d0c01",
+    "zh:ae1c826b5f84eb87f2fa23505a7c536a782d41eb5080f22e86cb7302fee1d8b4",
+    "zh:b3b7daed0065cc66d88c53692f6539fb77e6ddf30fd154765a6f8e9b3c1df384",
+    "zh:c53c7848eca19f3e7b9bb30d808d3484f371c1c47a03bcc2e736fba3454f8327",
+    "zh:e7cf68083d5d655794613b30cc52e8995c8672b424c6b5c4e9cf915fe2b539d7",
+    "zh:ece9ae93c194866d3365057e731c3571bde825b8558c5e8c4d9e12c1f624cd86",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/local" {
+  version = "2.1.0"
+  hashes = [
+    "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=",
+    "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2",
+    "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab",
+    "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3",
+    "zh:719dfd97bb9ddce99f7d741260b8ece2682b363735c764cac83303f02386075a",
+    "zh:7598bb86e0378fd97eaa04638c1a4c75f960f62f69d3662e6d80ffa5a89847fe",
+    "zh:ad0a188b52517fec9eca393f1e2c9daea362b33ae2eb38a857b6b09949a727c1",
+    "zh:c46846c8df66a13fee6eff7dc5d528a7f868ae0dcf92d79deaac73cc297ed20c",
+    "zh:dc1a20a2eec12095d04bf6da5321f535351a594a636912361db20eb2a707ccc4",
+    "zh:e57ab4771a9d999401f6badd8b018558357d3cbdf3d33cc0c4f83e818ca8e94b",
+    "zh:ebdcde208072b4b0f8d305ebf2bfdc62c926e0717599dcf8ec2fd8c5845031c3",
+    "zh:ef34c52b68933bedd0868a13ccfd59ff1c820f299760b3c02e008dc95e2ece91",
+  ]
+}
diff --git a/terraform/app/README.md b/terraform/app/README.md
new file mode 100644
index 000000000..50ceedb29
--- /dev/null
+++ b/terraform/app/README.md
@@ -0,0 +1,70 @@
+# Terraform Deployment
+
+We use terraform to create the services needed by the application and to deploy the application itself.
+
+We use terraform workspaces to keep the terraform state seperate for each environment.
+
+The terraform state is stored in an S3 bucket in the `sct-terraform` Cloud Foundry space
+
+### Setup
+
+- go to the application `/terraform/app` directory
+- install [tfenv](https://github.com/tfutils/tfenv)
+- run `tfenv install` to install the vesion of terraform specified in `.terraform-version`
+- ask the tech lead for access to the service within DfE's central GPaaS account
+- set the `cloudfoundry` provider credentials (GPaas username/password):
+```
+$ export CF_USER="username"
+$ export CF_PASSWORD="password"
+```
+- get the terraform state S3 Bucket AWS credentials
+```
+$ cf target -s sct-terraform
+$ cf service-key terraform-state terraform-state-key
+{
+ "aws_access_key_id": "AWS_ACCESS_KEY",
+ "aws_region": "AWS_REGION",
+ "aws_secret_access_key": "AWS_SECRET_ACCESS_KEY",
+ "bucket_name": "BUCKET_NAME",
+ "deploy_env": ""
+}
+```
+- set the AWS credentials:
+```
+$ export AWS_REGION=aws_region
+$ export AWS_ACCESS_KEY_ID=aws_access_key_id
+$ export AWS_SECRET_ACCESS_KEY=aws_secret_access_key
+```
+- initialise terraform to test the local environment:
+```
+terraform init
+```
+
+### Deploying
+
+- copy: `$PROJECT_PATH/terraform/workspace-variables/<environment>.tfvars.example`
+  to: `$PROJECT_PATH/terraform/workspace-variables/app/<environment>.tfvars`
+- copy: `$PROJECT_PATH/terraform/workspace-variables/<environment>_app_env.yml.example`
+  to: `$PROJECT_PATH/terraform/workspace-variables/app/<environment>_app_env.yml`
+- ask the Tech Lead for the environment's variables for `tfvars` and `app_env.yml` files
+- change to the relevant terraform workspace:
+```
+$ terraform workspace list
+$ terraform workspace select <environment>
+```
+- without any changes, ensure that this does not invoke any infrastructure changes:
+```
+$ terraform plan -var-file=<environment>.tfvars
+[...]
+
+No changes. Infrastructure is up-to-date.
+
+This means that Terraform did not detect any differences between your
+configuration and real physical resources that exist. As a result, no
+actions need to be performed.
+```
+- once you have modified or added any resources, deploy them:
+```
+$ terraform apply -var-file=<environment>.tfvars
+```
+- ensure a Pull Request is opened with the changes and merged in, otherwise the resources will be destroyed if terraform apply is ran elsewhere
diff --git a/terraform/app/backend.tf b/terraform/app/backend.tf
new file mode 100644
index 000000000..850ee177c
--- /dev/null
+++ b/terraform/app/backend.tf
@@ -0,0 +1,7 @@
+terraform {
+  backend "s3" {
+    bucket = "paas-s3-broker-prod-lon-04cdce2c-ebd3-4525-924e-d6ce670d2ee3"
+    key    = "terraform"
+    region = "eu-west-2"
+  }
+}
diff --git a/terraform/app/data.tf b/terraform/app/data.tf
new file mode 100644
index 000000000..90ae3d1ea
--- /dev/null
+++ b/terraform/app/data.tf
@@ -0,0 +1,24 @@
+data "cloudfoundry_org" "org" {
+  name = local.cloudfoundry_org
+}
+
+data "cloudfoundry_domain" "shared" {
+  name = local.shared_cloudfoundry_domain
+}
+
+data "cloudfoundry_domain" "custom" {
+  name = local.custom_cloudfoundry_domain
+}
+
+data "cloudfoundry_service" "redis" {
+  name = "redis"
+}
+
+data "cloudfoundry_service" "postgres" {
+  name = "postgres"
+}
+
+data "cloudfoundry_space" "space" {
+  name = local.cloudfoundry_space
+  org  = data.cloudfoundry_org.org.id
+}
diff --git a/terraform/app/generate-app-env-yml b/terraform/app/generate-app-env-yml
new file mode 100755
index 000000000..b7e2a6ae9
--- /dev/null
+++ b/terraform/app/generate-app-env-yml
@@ -0,0 +1,143 @@
+#!/bin/bash
+
+# exit on failures
+set -e
+set -o pipefail
+
+usage() {
+  echo "Usage: $(basename "$0") [OPTIONS]" 1>&2
+  echo "  -e <APP_ENVIRONMENTS> - App environment(s) (comma deliminated)  (Required)"
+  echo "  -P <PROJECT_NAME>     - Project name                            (default: 'buy-for-your-school')"
+  echo "  -u <CF_USER>          - Cloud Foundry Username                  (default: '\$CF_USER')"
+  echo "  -p <CF_PASSWORD>      - Cloud Foundry Password                  (default: '\$CF_PASSWORD')"
+  echo "  -s <CF_SPACE>         - Cloud Foundry Space                     (default: 'sct-\$APP_ENVIRONMENT')"
+  echo "  -h                    - help"
+  exit 1
+}
+
+# if there are no arguments passed exit with usage
+if [ $# -lt 1 ];
+then
+ usage
+fi
+
+APP_ENVIRONMENTS="${APP_ENVIRONMENTS:-}"
+PROJECT_NAME="${PROJECT_NAME:-buy-for-your-school}"
+CF_USER="${CF_USER:-}"
+CF_PASSWORD="${CF_PASSWORD:-}"
+CF_SPACE="${CF_SPACE:-}"
+
+while getopts "e:P:s:u:p:h" opt; do
+  case $opt in
+    e)
+      APP_ENVIRONMENTS=$OPTARG
+      ;;
+    P)
+      PROJECT_NAME=$OPTARG
+      ;;
+    s)
+      CF_SPACE=$OPTARG
+      ;;
+    u)
+      CF_USER=$OPTARG
+      ;;
+    p)
+      CF_PASSWORD=$OPTARG
+      ;;
+    h)
+      usage
+      exit;;
+    *)
+      usage
+      exit;;
+  esac
+done
+
+if [[
+  -z "$APP_ENVIRONMENTS" ||
+  -z "$CF_USER" ||
+  -z "$CF_PASSWORD"
+]]
+then
+  usage
+fi
+
+export CF_USER
+export CF_PASSWORD
+
+CF_SPACES="$(cf curl /v3/spaces)"
+
+IFS=',' read -ra ARR_APP_ENVIRONMENTS <<< "$APP_ENVIRONMENTS"
+for APP_ENVIRONMENT in "${ARR_APP_ENVIRONMENTS[@]}"; do
+
+  if [ -z "$CF_SPACE" ]
+  then
+    if [ "$APP_ENVIRONMENT" == "prod" ]
+    then
+      CF_SPACE="sct-production"
+    else
+      CF_SPACE="sct-$APP_ENVIRONMENT"
+    fi
+  fi
+  
+  if [ "$APP_ENVIRONMENT" == "production" ]
+  then
+    APP_NAME="$PROJECT_NAME-prod"
+  else
+    APP_NAME="$PROJECT_NAME-$APP_ENVIRONMENT"
+  fi
+
+  CF_SPACE_RESOURCE="$(echo "$CF_SPACES" | jq -r --arg s "$CF_SPACE" '.resources[] | select(.name == $s)')"
+  if [ -z "$CF_SPACE_RESOURCE" ]
+  then
+    echo "Error: Space not found - '$CF_SPACE'"
+    exit 1
+  else
+    CF_SPACE_GUID="$(echo "$CF_SPACE_RESOURCE" | jq -r '.guid')"
+  fi
+
+  CF_APPS_REQUEST_ARGS=$(
+    jq -n \
+    --arg name "$APP_NAME" \
+    --arg space_guid "$CF_SPACE_GUID" \
+    '{
+      name: $name,
+      space_guids: $space_guid
+    }'
+  )
+
+  CF_APPS="$(cf curl -X GET /v3/apps -d "$CF_APPS_REQUEST_ARGS")"
+  CF_APPS_RESOURCE="$(echo "$CF_APPS" | jq -r --arg a "$APP_NAME" '.resources[] | select(.name == $a)')"
+  if [ -z "$CF_APPS_RESOURCE" ]
+  then
+    echo "Error: App not found - '$APP_NAME' in Space '$CF_SPACE'"
+    exit 1
+  else
+    CF_APP_GUID="$(echo "$CF_APPS_RESOURCE" | jq -r '.guid')"
+  fi
+  
+  APP_ENV="$(cf curl -X GET /v3/apps/"$CF_APP_GUID"/env)"
+  
+  ENVARS="$(echo "$APP_ENV" | jq -r '.environment_variables')"
+
+  if [ "$APP_ENVIRONMENT" == "production" ]
+  then
+    APP_ENV_FILE_NAME="prod_app_env.yml"
+  else
+    APP_ENV_FILE_NAME="${APP_ENVIRONMENT}_app_env.yml"
+  fi
+  
+  if [ -f "$APP_ENV_FILE_NAME" ]
+  then
+    read -r -p "File $APP_ENV_FILE_NAME exists, overwrite? (y/n): " WRITE_ENV_FILE
+  else
+    WRITE_ENV_FILE="y"
+  fi
+  
+  if [ "$WRITE_ENV_FILE" == "y" ]
+  then
+    echo "---" > "${APP_ENVIRONMENT}_app_env.yml"
+    echo "$ENVARS" | yq eval -P >> "${APP_ENVIRONMENT}_app_env.yml"
+    echo "${APP_ENVIRONMENT}_app_env.yml file created :)" 
+  fi
+done
diff --git a/terraform/app/locals.tf b/terraform/app/locals.tf
new file mode 100644
index 000000000..6b385466c
--- /dev/null
+++ b/terraform/app/locals.tf
@@ -0,0 +1,42 @@
+locals {
+  project_name = var.project_name
+  environment  = var.environment
+
+  cloudfoundry_org           = var.cloudfoundry_org
+  cloudfoundry_space         = local.environment == "prod" ? "sct-production" : "sct-${local.environment}"
+  shared_cloudfoundry_domain = var.shared_cloudfoundry_domain
+  custom_cloudfoundry_domain = var.custom_cloudfoundry_domain
+
+  custom_hostname = local.environment == "prod" ? "get-help-buying-for-schools" : "${local.environment}-get-help-buying-for-schools"
+
+  redis_class    = var.redis_class
+  redis_timeouts = var.redis_timeouts
+
+  postgres_class       = local.environment == "prod" ? var.postgres_class_prod : var.postgres_class
+  postgres_json_params = jsonencode(var.postgres_json_params)
+  postgres_timeouts    = var.postgres_timeouts
+
+  app_env_yaml_file = file("${local.environment}_app_env.yml")
+  app_env           = yamldecode(local.app_env_yaml_file)
+  domain            = "${local.project_name}-${local.environment}.${local.shared_cloudfoundry_domain}"
+  app_env_domain = {
+    "DOMAIN" = local.domain
+  }
+  app_environment = merge(
+    local.app_env_domain,
+    local.app_env,
+  )
+
+  web_app_docker_image               = var.docker_image
+  web_app_instances                  = var.web_app_instances
+  web_app_disk_quota                 = var.web_app_disk_quota
+  web_app_timeout                    = var.web_app_timeout
+  web_app_health_check_http_endpoint = var.web_app_health_check_http_endpoint
+
+  web_worker_command              = var.web_worker_command
+  web_worker_docker_image         = var.docker_image
+  web_worker_instances            = var.web_worker_instances
+  web_worker_disk_quota           = var.web_worker_disk_quota
+  web_worker_timeout              = var.web_worker_timeout
+  web_worker_health_check_timeout = var.web_worker_timeout
+}
diff --git a/terraform/app/postgres.tf b/terraform/app/postgres.tf
new file mode 100644
index 000000000..6fc854715
--- /dev/null
+++ b/terraform/app/postgres.tf
@@ -0,0 +1,11 @@
+resource "cloudfoundry_service_instance" "postgres" {
+  name         = "${local.environment}-postgres"
+  space        = data.cloudfoundry_space.space.id
+  service_plan = data.cloudfoundry_service.postgres.service_plans[local.postgres_class]
+  json_params  = local.postgres_json_params
+  timeouts {
+    create = local.postgres_timeouts.create
+    update = local.postgres_timeouts.update
+    delete = local.postgres_timeouts.delete
+  }
+}
diff --git a/terraform/app/providers.tf b/terraform/app/providers.tf
new file mode 100644
index 000000000..61d50b88e
--- /dev/null
+++ b/terraform/app/providers.tf
@@ -0,0 +1,12 @@
+provider "cloudfoundry" {
+  api_url = "https://api.london.cloud.service.gov.uk"
+}
+
+terraform {
+  required_providers {
+    cloudfoundry = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "~> 0.13.0"
+    }
+  }
+}
diff --git a/terraform/app/redis.tf b/terraform/app/redis.tf
new file mode 100644
index 000000000..21425aba9
--- /dev/null
+++ b/terraform/app/redis.tf
@@ -0,0 +1,10 @@
+resource "cloudfoundry_service_instance" "redis" {
+  name         = "${local.environment}-redis"
+  space        = data.cloudfoundry_space.space.id
+  service_plan = data.cloudfoundry_service.redis.service_plans[local.redis_class]
+  timeouts {
+    create = local.redis_timeouts.create
+    update = local.redis_timeouts.update
+    delete = local.redis_timeouts.delete
+  }
+}
diff --git a/terraform/app/routes.tf b/terraform/app/routes.tf
new file mode 100644
index 000000000..8a113c197
--- /dev/null
+++ b/terraform/app/routes.tf
@@ -0,0 +1,11 @@
+resource "cloudfoundry_route" "shared_route" {
+  domain   = data.cloudfoundry_domain.shared.id
+  space    = data.cloudfoundry_space.space.id
+  hostname = "${local.project_name}-${local.environment}"
+}
+
+resource "cloudfoundry_route" "custom_route" {
+  domain   = data.cloudfoundry_domain.custom.id
+  space    = data.cloudfoundry_space.space.id
+  hostname = local.custom_hostname
+}
diff --git a/terraform/app/variables.tf b/terraform/app/variables.tf
new file mode 100644
index 000000000..2e51a5522
--- /dev/null
+++ b/terraform/app/variables.tf
@@ -0,0 +1,138 @@
+variable "environment" {
+  description = "Environment"
+  type        = string
+}
+
+variable "project_name" {
+  description = "Project name"
+  default     = "buy-for-your-school"
+  type        = string
+}
+
+variable "cloudfoundry_org" {
+  description = "CloudFoundry Org"
+  default     = "dfe"
+  type        = string
+}
+
+variable "shared_cloudfoundry_domain" {
+  description = "Shared Cloud Foundry domain"
+  default     = "london.cloudapps.digital"
+  type        = string
+}
+
+variable "custom_cloudfoundry_domain" {
+  description = "Custom Cloud Foundry domain"
+  default     = "education.gov.uk"
+  type        = string
+}
+
+variable "redis_class" {
+  description = "Redis class"
+  default     = "tiny-5_x"
+  type        = string
+}
+
+variable "redis_timeouts" {
+  description = "Redis timeouts"
+  default = {
+    create = "2h"
+    update = "2h"
+    delete = "2h"
+  }
+  type = map(string)
+}
+
+variable "postgres_class" {
+  description = "Postgres class"
+  default     = "small-11"
+  type        = string
+}
+
+variable "postgres_class_prod" {
+  description = "Postgres class (Production environment)"
+  default     = "medium-11"
+  type        = string
+}
+
+variable "postgres_json_params" {
+  description = "Postgres json_params"
+  default = {
+    enable_extensions = [
+      "pgcrypto",
+      "plpgsql",
+    ]
+  }
+  type = map(any)
+}
+
+variable "postgres_timeouts" {
+  description = "Postgres timeouts"
+  default = {
+    create = "2h"
+    update = "2h"
+    delete = "2h"
+  }
+  type = map(string)
+}
+
+variable "docker_image" {
+  description = "Docker image"
+  default     = ""
+  type        = string
+}
+
+
+variable "web_app_instances" {
+  description = "Web app instance number"
+  default     = 2
+  type        = number
+}
+
+variable "web_app_disk_quota" {
+  description = "Web app disk quota"
+  default     = 3072
+  type        = number
+}
+
+variable "web_app_timeout" {
+  description = "Web app timeout"
+  default     = 120
+  type        = number
+}
+
+variable "web_app_health_check_http_endpoint" {
+  description = "Web app health check HTTP endpoint"
+  default     = "/health_check"
+  type        = string
+}
+
+variable "web_worker_instances" {
+  description = "Web worker instance number"
+  default     = 1
+  type        = number
+}
+
+variable "web_worker_disk_quota" {
+  description = "Web worker disk quota"
+  default     = 3072
+  type        = number
+}
+
+variable "web_worker_timeout" {
+  description = "Web worker timeout"
+  default     = 120
+  type        = number
+}
+
+variable "web_worker_health_check_timeout" {
+  description = "Web worker health check timeout"
+  default     = 10
+  type        = number
+}
+
+variable "web_worker_command" {
+  description = "Web worker command"
+  default     = "bundle exec sidekiq -C config/sidekiq.yml"
+  type        = string
+}
diff --git a/terraform/app/web-app.tf b/terraform/app/web-app.tf
new file mode 100644
index 000000000..81179ab07
--- /dev/null
+++ b/terraform/app/web-app.tf
@@ -0,0 +1,22 @@
+resource "cloudfoundry_app" "web_app" {
+  name                       = "${local.project_name}-${local.environment}"
+  space                      = data.cloudfoundry_space.space.id
+  instances                  = local.web_app_instances
+  disk_quota                 = local.web_app_disk_quota
+  timeout                    = local.web_app_timeout
+  docker_image               = local.web_app_docker_image
+  strategy                   = "blue-green-v2"
+  health_check_http_endpoint = local.web_app_health_check_http_endpoint
+
+  service_binding { service_instance = cloudfoundry_service_instance.redis.id }
+  service_binding { service_instance = cloudfoundry_service_instance.postgres.id }
+
+  environment = local.app_environment
+
+  routes {
+    route = cloudfoundry_route.shared_route.id
+  }
+  routes {
+    route = cloudfoundry_route.custom_route.id
+  }
+}
diff --git a/terraform/app/web-worker.tf b/terraform/app/web-worker.tf
new file mode 100644
index 000000000..4fdbffa2e
--- /dev/null
+++ b/terraform/app/web-worker.tf
@@ -0,0 +1,18 @@
+resource "cloudfoundry_app" "web_worker" {
+  name                       = "${local.project_name}-worker-${local.environment}"
+  command                    = local.web_worker_command
+  space                      = data.cloudfoundry_space.space.id
+  instances                  = local.web_worker_instances
+  disk_quota                 = local.web_worker_disk_quota
+  timeout                    = local.web_worker_timeout
+  docker_image               = local.web_worker_docker_image
+  strategy                   = "blue-green-v2"
+  health_check_type          = "process"
+  health_check_timeout       = local.web_worker_health_check_timeout
+  health_check_http_endpoint = local.web_app_health_check_http_endpoint
+
+  service_binding { service_instance = cloudfoundry_service_instance.redis.id }
+  service_binding { service_instance = cloudfoundry_service_instance.postgres.id }
+
+  environment = local.app_environment
+}
diff --git a/terraform/workspace-variables/preview.tfvars.example b/terraform/workspace-variables/preview.tfvars.example
new file mode 100644
index 000000000..f4fe9bedc
--- /dev/null
+++ b/terraform/workspace-variables/preview.tfvars.example
@@ -0,0 +1 @@
+environment = "preview"
diff --git a/terraform/workspace-variables/preview_app_env.yml.example b/terraform/workspace-variables/preview_app_env.yml.example
new file mode 100644
index 000000000..6f9d71bf1
--- /dev/null
+++ b/terraform/workspace-variables/preview_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: preview-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/prod.tfvars.example b/terraform/workspace-variables/prod.tfvars.example
new file mode 100644
index 000000000..23a817b17
--- /dev/null
+++ b/terraform/workspace-variables/prod.tfvars.example
@@ -0,0 +1 @@
+environment = "prod"
diff --git a/terraform/workspace-variables/prod_app_env.yml.example b/terraform/workspace-variables/prod_app_env.yml.example
new file mode 100644
index 000000000..01fe792e1
--- /dev/null
+++ b/terraform/workspace-variables/prod_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: production-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/research.tfvars.example b/terraform/workspace-variables/research.tfvars.example
new file mode 100644
index 000000000..a2bf34abd
--- /dev/null
+++ b/terraform/workspace-variables/research.tfvars.example
@@ -0,0 +1 @@
+environment = "research"
diff --git a/terraform/workspace-variables/research_app_env.yml.example b/terraform/workspace-variables/research_app_env.yml.example
new file mode 100644
index 000000000..e5b9e4cfa
--- /dev/null
+++ b/terraform/workspace-variables/research_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: research-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET:
diff --git a/terraform/workspace-variables/staging.tfvars.example b/terraform/workspace-variables/staging.tfvars.example
new file mode 100644
index 000000000..b22722838
--- /dev/null
+++ b/terraform/workspace-variables/staging.tfvars.example
@@ -0,0 +1 @@
+environment = "staging"
diff --git a/terraform/workspace-variables/staging_app_env.yml.example b/terraform/workspace-variables/staging_app_env.yml.example
new file mode 100644
index 000000000..ffe09360c
--- /dev/null
+++ b/terraform/workspace-variables/staging_app_env.yml.example
@@ -0,0 +1,28 @@
+---
+RACK_ENV: production
+RAILS_ENV: production
+SECRET_KEY_BASE: secret # rake secret
+RAILS_LOG_TO_STDOUT: enabled
+RAILS_SERVE_STATIC_FILES: enabled
+
+APPLICATION_URL:
+
+# Monitoring
+ROLLBAR_ENV: staging-paas
+ROLLBAR_ACCESS_TOKEN:
+
+# Contentful API
+CONTENTFUL_ACCESS_TOKEN:
+CONTENTFUL_DEFAULT_CATEGORY_ENTRY_ID:
+CONTENTFUL_ENTRY_CACHING:
+CONTENTFUL_ENTRY_CACHING_TTL:
+CONTENTFUL_ENVIRONMENT:
+CONTENTFUL_URL:
+CONTENTFUL_SPACE:
+
+# DfE Sign-in (SSO)
+DFE_SIGN_IN_ENABLED:
+DFE_SIGN_IN_IDENTIFIER:
+DFE_SIGN_IN_ISSUER:
+DFE_SIGN_IN_REDIRECT_URL:
+DFE_SIGN_IN_SECRET: