diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000000..af82887879
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v8.16.0
\ No newline at end of file
diff --git a/_js/standard-bundle.js.tmp b/_js/standard-bundle.js.tmp
deleted file mode 100644
index e1b4e804aa..0000000000
--- a/_js/standard-bundle.js.tmp
+++ /dev/null
@@ -1,4 +0,0 @@
-// import './modules/details-toggle';
-import './modules/domready';
-import './modules/focus-styles';
-import './modules/inpagelink';
diff --git a/_prototypes/your-household-v13/assets/household.js b/_prototypes/your-household-v13/assets/household.js
new file mode 100644
index 0000000000..a041218fc3
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/household.js
@@ -0,0 +1,137 @@
+import {autoIncrementId} from './utils';
+
+export const HOUSEHOLD_MEMBERS_STORAGE_KEY = 'household-members';
+export const USER_HOUSEHOLD_MEMBER_ID = 'person_me';
+export const HOUSEHOLD_MEMBER_TYPE = 'household-member';
+export const VISITOR_TYPE = 'visitor';
+
+/**
+ * Types
+ */
+export function person(opts) {
+  if (opts.firstName === '' || opts.lastName === '') {
+    console.log('Unable to create person with data: ',
+      opts.firstName,
+      !opts.middleName,
+      !opts.lastName);
+  }
+
+  let middleName = opts.middleName || '';
+
+  return {
+    fullName: opts.firstName + ' ' + middleName + ' ' + opts.lastName,
+    firstName: opts.firstName,
+    middleName,
+    lastName: opts.lastName
+  };
+}
+
+/**
+ * Storage
+ */
+export function getUserAsHouseholdMember() {
+  return getAllHouseholdMembers().find((member) => {
+    return member['@person'].id === USER_HOUSEHOLD_MEMBER_ID;
+  });
+}
+
+export function deleteUserAsHouseholdMember() {
+  deleteHouseholdMember(USER_HOUSEHOLD_MEMBER_ID);
+}
+
+export function deleteHouseholdMember(personId) {
+  let members = getAllHouseholdMembers().filter((member) => {
+    return member['@person'].id !== personId;
+  });
+
+  sessionStorage.setItem(HOUSEHOLD_MEMBERS_STORAGE_KEY,
+    JSON.stringify(members));
+}
+
+export function updateUserAsHouseholdMember(person, memberData) {
+  let userAsHouseholdMember = getUserAsHouseholdMember();
+
+  userAsHouseholdMember
+    ? updateHouseholdMember({
+      ...userAsHouseholdMember['@person'],
+      ...person
+    }, memberData)
+    : addHouseholdMember(person, memberData, USER_HOUSEHOLD_MEMBER_ID);
+}
+
+export function updateHouseholdMember(person, memberData) {
+  let membersUpdated = getAllHouseholdMembers().map((member) => {
+    return member['@person'].id === person.id
+      ? {...member, ...memberData, '@person': {...member['@person'], ...person}}
+      : member;
+  });
+
+  sessionStorage.setItem(HOUSEHOLD_MEMBERS_STORAGE_KEY,
+    JSON.stringify(membersUpdated));
+}
+
+export function addHouseholdMember(person, memberData, id) {
+  let people = getAllHouseholdMembers() || [];
+  memberData = memberData || {};
+
+  /**
+   * User is always first in the household list
+   */
+  people[id === USER_HOUSEHOLD_MEMBER_ID ? 'unshift' : 'push']({
+    ...memberData,
+    type: memberData.type || HOUSEHOLD_MEMBER_TYPE,
+    '@person': {
+      ...person,
+      id: id || 'person' + autoIncrementId('household-members')
+    }
+  });
+
+  sessionStorage.setItem(HOUSEHOLD_MEMBERS_STORAGE_KEY, JSON.stringify(people));
+}
+
+export function getAllHouseholdMembers() {
+  return JSON.parse(sessionStorage.getItem(HOUSEHOLD_MEMBERS_STORAGE_KEY)) || [];
+}
+
+export function getHouseholdMemberByPersonId(id) {
+  return getAllHouseholdMembers().find(function(member) {
+    return member['@person'].id === id;
+  });
+}
+
+export function getMemberPersonId(member) {
+  return member['@person'].id;
+}
+
+/**
+ * Comparators
+ */
+export function isVisitor(member) {
+  return member.type === window.ONS.storage.KEYS.VISITOR_TYPE;
+}
+
+export function isHouseholdMember(member) {
+  return member.type === window.ONS.storage.KEYS.HOUSEHOLD_MEMBER_TYPE;
+}
+
+export function isOtherHouseholdMember(member) {
+  return member.type === window.ONS.storage.KEYS.HOUSEHOLD_MEMBER_TYPE &&
+    member['@person'].id !== window.ONS.storage.IDS.USER_HOUSEHOLD_MEMBER_ID;
+}
+
+export const tempAwayQuestionSentenceMap = {
+  'three-more': 'People who usually live outside the UK who are staying in the UK for 3 months or more',
+  'perm-away': 'People who work away from home within the UK if this is their permanent or family home',
+  'armed-forces': 'Members of the armed forces if this is their permanent or family home',
+  'less-twelve': 'People who are temporarily outside the UK for less than 12 months',
+  'usually-temp': 'People staying temporarily who usually live in the UK but' +
+    ' do not have another UK address for example, relatives, friends',
+  'other': 'Other people who usually live here but are temporarily away'
+};
+
+export const visitorQuestionSentenceMap = {
+  'usually-in-uk': 'People who usually live somewhere else in the UK, for example boy/girlfriends, friends or relatives',
+  'second-address': 'People staying here because it is their second address, for example, for work. Their permanent or family home is elsewhere',
+  'less-three': 'People who usually live outside the UK who are staying in the UK for less than three months',
+  'on-holiday': 'People here on holiday',
+};
diff --git a/_prototypes/your-household-v13/assets/lib/CustomEvent-polyfill.js b/_prototypes/your-household-v13/assets/lib/CustomEvent-polyfill.js
new file mode 100644
index 0000000000..0dd012c6a6
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/CustomEvent-polyfill.js
@@ -0,0 +1,16 @@
+// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent
+(function () {
+
+  if ( typeof window.CustomEvent === "function" ) return false;
+
+  function CustomEvent ( event, params ) {
+    params = params || { bubbles: false, cancelable: false, detail: null };
+    var evt = document.createEvent( 'CustomEvent' );
+    evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail );
+    return evt;
+  }
+
+  CustomEvent.prototype = window.Event.prototype;
+
+  window.CustomEvent = CustomEvent;
+})();
diff --git a/_prototypes/your-household-v13/assets/lib/FileSaver.js b/_prototypes/your-household-v13/assets/lib/FileSaver.js
new file mode 100644
index 0000000000..3f3077b273
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/FileSaver.js
@@ -0,0 +1,174 @@
+/*
+* FileSaver.js
+* A saveAs() FileSaver implementation.
+*
+* By Eli Grey, http://eligrey.com
+*
+* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+* source  : http://purl.eligrey.com/github/FileSaver.js
+*/
+
+
+// The one and only way of getting global scope in all environments
+// https://stackoverflow.com/q/3277182/1008999
+var _global = typeof window === 'object' && window.window === window
+  ? window : typeof self === 'object' && self.self === self
+    ? self : typeof global === 'object' && global.global === global
+      ? global
+      : this;
+
+function bom(blob, opts) {
+  if (typeof opts === 'undefined') opts = {autoBom: false}
+  else if (typeof opts !== 'object') {
+    console.warn('Deprecated: Expected third argument to be a object')
+    opts = {autoBom: !opts}
+  }
+
+  // prepend BOM for UTF-8 XML and text/* types (including HTML)
+  // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+  if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+    return new Blob([String.fromCharCode(0xFEFF), blob], {type: blob.type})
+  }
+  return blob
+}
+
+function download(url, name, opts) {
+  var xhr = new XMLHttpRequest()
+  xhr.open('GET', url)
+  xhr.responseType = 'blob'
+  xhr.onload = function() {
+    saveAs(xhr.response, name, opts)
+  }
+  xhr.onerror = function() {
+    console.error('could not download file')
+  }
+  xhr.send()
+}
+
+function corsEnabled(url) {
+  var xhr = new XMLHttpRequest()
+  // use sync to avoid popup blocker
+  xhr.open('HEAD', url, false)
+  xhr.send()
+  return xhr.status >= 200 && xhr.status <= 299
+}
+
+// `a.click()` doesn't work for all browsers (#465)
+function click(node) {
+  try {
+    node.dispatchEvent(new MouseEvent('click'))
+  } catch (e) {
+    var evt = document.createEvent('MouseEvents')
+    evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
+      20, false, false, false, false, 0, null)
+    node.dispatchEvent(evt)
+  }
+}
+
+var saveAs = _global.saveAs || (
+  // probably in some web worker
+  (typeof window !== 'object' || window !== _global)
+    ? function saveAs() { /* noop */
+    }
+
+    // Use download attribute first if possible (#193 Lumia mobile)
+    : 'download' in HTMLAnchorElement.prototype
+    ? function saveAs(blob, name, opts) {
+      var URL = _global.URL || _global.webkitURL
+      var a = document.createElement('a')
+      name = name || blob.name || 'download'
+
+      a.download = name
+      a.rel = 'noopener' // tabnabbing
+
+      // TODO: detect chrome extensions & packaged apps
+      // a.target = '_blank'
+
+      if (typeof blob === 'string') {
+        // Support regular links
+        a.href = blob
+        if (a.origin !== location.origin) {
+          corsEnabled(a.href)
+            ? download(blob, name, opts)
+            : click(a, a.target = '_blank')
+        } else {
+          click(a)
+        }
+      } else {
+        // Support blobs
+        a.href = URL.createObjectURL(blob)
+        setTimeout(function() {
+          URL.revokeObjectURL(a.href)
+        }, 4E4) // 40s
+        setTimeout(function() {
+          click(a)
+        }, 0)
+      }
+    }
+
+    // Use msSaveOrOpenBlob as a second approach
+    : 'msSaveOrOpenBlob' in navigator
+      ? function saveAs(blob, name, opts) {
+        name = name || blob.name || 'download'
+
+        if (typeof blob === 'string') {
+          if (corsEnabled(blob)) {
+            download(blob, name, opts)
+          } else {
+            var a = document.createElement('a')
+            a.href = blob
+            a.target = '_blank'
+            setTimeout(function() {
+              click(a)
+            })
+          }
+        } else {
+          navigator.msSaveOrOpenBlob(bom(blob, opts), name)
+        }
+      }
+
+      // Fallback to using FileReader and a popup
+      : function saveAs(blob, name, opts, popup) {
+        // Open a popup immediately do go around popup blocker
+        // Mostly only available on user interaction and the fileReader is async so...
+        popup = popup || open('', '_blank')
+        if (popup) {
+          popup.document.title =
+            popup.document.body.innerText = 'downloading...'
+        }
+
+        if (typeof blob === 'string') return download(blob, name, opts)
+
+        var force = blob.type === 'application/octet-stream'
+        var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari
+        var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent)
+
+        if ((isChromeIOS || (force && isSafari)) && typeof FileReader === 'object') {
+          // Safari doesn't allow downloading of blob URLs
+          var reader = new FileReader()
+          reader.onloadend = function() {
+            var url = reader.result
+            url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')
+            if (popup) popup.location.href = url
+            else location = url
+            popup = null // reverse-tabnabbing #460
+          }
+          reader.readAsDataURL(blob)
+        } else {
+          var URL = _global.URL || _global.webkitURL
+          var url = URL.createObjectURL(blob)
+          if (popup) popup.location = url
+          else location.href = url
+          popup = null // reverse-tabnabbing #460
+          setTimeout(function() {
+            URL.revokeObjectURL(url)
+          }, 4E4) // 40s
+        }
+      }
+)
+
+_global.saveAs = saveAs.saveAs = saveAs
+
+if (typeof module !== 'undefined') {
+  module.exports = saveAs;
+}
diff --git a/_prototypes/your-household-v13/assets/lib/abortcontroller-polyfill.js b/_prototypes/your-household-v13/assets/lib/abortcontroller-polyfill.js
new file mode 100644
index 0000000000..e78488d7bc
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/abortcontroller-polyfill.js
@@ -0,0 +1,477 @@
+(function (factory) {
+  typeof define === 'function' && define.amd ? define(factory) :
+    factory();
+}(function () { 'use strict';
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  function _defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+  }
+
+  function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+      throw new TypeError("Super expression must either be null or a function");
+    }
+
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    });
+    if (superClass) _setPrototypeOf(subClass, superClass);
+  }
+
+  function _getPrototypeOf(o) {
+    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+      return o.__proto__ || Object.getPrototypeOf(o);
+    };
+    return _getPrototypeOf(o);
+  }
+
+  function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+      o.__proto__ = p;
+      return o;
+    };
+
+    return _setPrototypeOf(o, p);
+  }
+
+  function _assertThisInitialized(self) {
+    if (self === void 0) {
+      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+
+    return self;
+  }
+
+  function _possibleConstructorReturn(self, call) {
+    if (call && (typeof call === "object" || typeof call === "function")) {
+      return call;
+    }
+
+    return _assertThisInitialized(self);
+  }
+
+  function _superPropBase(object, property) {
+    while (!Object.prototype.hasOwnProperty.call(object, property)) {
+      object = _getPrototypeOf(object);
+      if (object === null) break;
+    }
+
+    return object;
+  }
+
+  function _get(target, property, receiver) {
+    if (typeof Reflect !== "undefined" && Reflect.get) {
+      _get = Reflect.get;
+    } else {
+      _get = function _get(target, property, receiver) {
+        var base = _superPropBase(target, property);
+
+        if (!base) return;
+        var desc = Object.getOwnPropertyDescriptor(base, property);
+
+        if (desc.get) {
+          return desc.get.call(receiver);
+        }
+
+        return desc.value;
+      };
+    }
+
+    return _get(target, property, receiver || target);
+  }
+
+  var Emitter =
+    /*#__PURE__*/
+    function () {
+      function Emitter() {
+        _classCallCheck(this, Emitter);
+
+        Object.defineProperty(this, 'listeners', {
+          value: {},
+          writable: true,
+          configurable: true
+        });
+      }
+
+      _createClass(Emitter, [{
+        key: "addEventListener",
+        value: function addEventListener(type, callback) {
+          if (!(type in this.listeners)) {
+            this.listeners[type] = [];
+          }
+
+          this.listeners[type].push(callback);
+        }
+      }, {
+        key: "removeEventListener",
+        value: function removeEventListener(type, callback) {
+          if (!(type in this.listeners)) {
+            return;
+          }
+
+          var stack = this.listeners[type];
+
+          for (var i = 0, l = stack.length; i < l; i++) {
+            if (stack[i] === callback) {
+              stack.splice(i, 1);
+              return;
+            }
+          }
+        }
+      }, {
+        key: "dispatchEvent",
+        value: function dispatchEvent(event) {
+          var _this = this;
+
+          if (!(event.type in this.listeners)) {
+            return;
+          }
+
+          var debounce = function debounce(callback) {
+            setTimeout(function () {
+              return callback.call(_this, event);
+            });
+          };
+
+          var stack = this.listeners[event.type];
+
+          for (var i = 0, l = stack.length; i < l; i++) {
+            debounce(stack[i]);
+          }
+
+          return !event.defaultPrevented;
+        }
+      }]);
+
+      return Emitter;
+    }();
+
+  var AbortSignal =
+    /*#__PURE__*/
+    function (_Emitter) {
+      _inherits(AbortSignal, _Emitter);
+
+      function AbortSignal() {
+        var _this2;
+
+        _classCallCheck(this, AbortSignal);
+
+        _this2 = _possibleConstructorReturn(this, _getPrototypeOf(AbortSignal).call(this)); // Some versions of babel does not transpile super() correctly for IE <= 10, if the parent
+        // constructor has failed to run, then "this.listeners" will still be undefined and then we call
+        // the parent constructor directly instead as a workaround. For general details, see babel bug:
+        // https://github.com/babel/babel/issues/3041
+        // This hack was added as a fix for the issue described here:
+        // https://github.com/Financial-Times/polyfill-library/pull/59#issuecomment-477558042
+
+        if (!_this2.listeners) {
+          Emitter.call(_assertThisInitialized(_this2));
+        } // Compared to assignment, Object.defineProperty makes properties non-enumerable by default and
+        // we want Object.keys(new AbortController().signal) to be [] for compat with the native impl
+
+
+        Object.defineProperty(_assertThisInitialized(_this2), 'aborted', {
+          value: false,
+          writable: true,
+          configurable: true
+        });
+        Object.defineProperty(_assertThisInitialized(_this2), 'onabort', {
+          value: null,
+          writable: true,
+          configurable: true
+        });
+        return _this2;
+      }
+
+      _createClass(AbortSignal, [{
+        key: "toString",
+        value: function toString() {
+          return '[object AbortSignal]';
+        }
+      }, {
+        key: "dispatchEvent",
+        value: function dispatchEvent(event) {
+          if (event.type === 'abort') {
+            this.aborted = true;
+
+            if (typeof this.onabort === 'function') {
+              this.onabort.call(this, event);
+            }
+          }
+
+          _get(_getPrototypeOf(AbortSignal.prototype), "dispatchEvent", this).call(this, event);
+        }
+      }]);
+
+      return AbortSignal;
+    }(Emitter);
+  var AbortController =
+    /*#__PURE__*/
+    function () {
+      function AbortController() {
+        _classCallCheck(this, AbortController);
+
+        // Compared to assignment, Object.defineProperty makes properties non-enumerable by default and
+        // we want Object.keys(new AbortController()) to be [] for compat with the native impl
+        Object.defineProperty(this, 'signal', {
+          value: new AbortSignal(),
+          writable: true,
+          configurable: true
+        });
+      }
+
+      _createClass(AbortController, [{
+        key: "abort",
+        value: function abort() {
+          var event;
+
+          try {
+            event = new Event('abort');
+          } catch (e) {
+            if (typeof document !== 'undefined') {
+              if (!document.createEvent) {
+                // For Internet Explorer 8:
+                event = document.createEventObject();
+                event.type = 'abort';
+              } else {
+                // For Internet Explorer 11:
+                event = document.createEvent('Event');
+                event.initEvent('abort', false, false);
+              }
+            } else {
+              // Fallback where document isn't available:
+              event = {
+                type: 'abort',
+                bubbles: false,
+                cancelable: false
+              };
+            }
+          }
+
+          this.signal.dispatchEvent(event);
+        }
+      }, {
+        key: "toString",
+        value: function toString() {
+          return '[object AbortController]';
+        }
+      }]);
+
+      return AbortController;
+    }();
+
+  if (typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+    // These are necessary to make sure that we get correct output for:
+    // Object.prototype.toString.call(new AbortController())
+    AbortController.prototype[Symbol.toStringTag] = 'AbortController';
+    AbortSignal.prototype[Symbol.toStringTag] = 'AbortSignal';
+  }
+
+  function polyfillNeeded(self) {
+    if (self.__FORCE_INSTALL_ABORTCONTROLLER_POLYFILL) {
+      console.log('__FORCE_INSTALL_ABORTCONTROLLER_POLYFILL=true is set, will force install polyfill');
+      return true;
+    } // Note that the "unfetch" minimal fetch polyfill defines fetch() without
+    // defining window.Request, and this polyfill need to work on top of unfetch
+    // so the below feature detection needs the !self.AbortController part.
+    // The Request.prototype check is also needed because Safari versions 11.1.2
+    // up to and including 12.1.x has a window.AbortController present but still
+    // does NOT correctly implement abortable fetch:
+    // https://bugs.webkit.org/show_bug.cgi?id=174980#c2
+
+
+    return typeof self.Request === 'function' && !self.Request.prototype.hasOwnProperty('signal') || !self.AbortController;
+  }
+
+  /**
+   * Note: the "fetch.Request" default value is available for fetch imported from
+   * the "node-fetch" package and not in browsers. This is OK since browsers
+   * will be importing umd-polyfill.js from that path "self" is passed the
+   * decorator so the default value will not be used (because browsers that define
+   * fetch also has Request). One quirky setup where self.fetch exists but
+   * self.Request does not is when the "unfetch" minimal fetch polyfill is used
+   * on top of IE11; for this case the browser will try to use the fetch.Request
+   * default value which in turn will be undefined but then then "if (Request)"
+   * will ensure that you get a patched fetch but still no Request (as expected).
+   * @param {fetch, Request = fetch.Request}
+   * @returns {fetch: abortableFetch, Request: AbortableRequest}
+   */
+
+  function abortableFetchDecorator(patchTargets) {
+    if ('function' === typeof patchTargets) {
+      patchTargets = {
+        fetch: patchTargets
+      };
+    }
+
+    var _patchTargets = patchTargets,
+      fetch = _patchTargets.fetch,
+      _patchTargets$Request = _patchTargets.Request,
+      NativeRequest = _patchTargets$Request === void 0 ? fetch.Request : _patchTargets$Request,
+      NativeAbortController = _patchTargets.AbortController,
+      _patchTargets$__FORCE = _patchTargets.__FORCE_INSTALL_ABORTCONTROLLER_POLYFILL,
+      __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL = _patchTargets$__FORCE === void 0 ? false : _patchTargets$__FORCE;
+
+    if (!polyfillNeeded({
+      fetch: fetch,
+      Request: NativeRequest,
+      AbortController: NativeAbortController,
+      __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL: __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL
+    })) {
+      return {
+        fetch: fetch,
+        Request: Request
+      };
+    }
+
+    var Request = NativeRequest; // Note that the "unfetch" minimal fetch polyfill defines fetch() without
+    // defining window.Request, and this polyfill need to work on top of unfetch
+    // hence we only patch it if it's available. Also we don't patch it if signal
+    // is already available on the Request prototype because in this case support
+    // is present and the patching below can cause a crash since it assigns to
+    // request.signal which is technically a read-only property. This latter error
+    // happens when you run the main5.js node-fetch example in the repo
+    // "abortcontroller-polyfill-examples". The exact error is:
+    //   request.signal = init.signal;
+    //   ^
+    // TypeError: Cannot set property signal of #<Request> which has only a getter
+
+    if (Request && !Request.prototype.hasOwnProperty('signal') || __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL) {
+      Request = function Request(input, init) {
+        var signal;
+
+        if (init && init.signal) {
+          signal = init.signal; // Never pass init.signal to the native Request implementation when the polyfill has
+          // been installed because if we're running on top of a browser with a
+          // working native AbortController (i.e. the polyfill was installed due to
+          // __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL being set), then passing our
+          // fake AbortSignal to the native fetch will trigger:
+          // TypeError: Failed to construct 'Request': member signal is not of type AbortSignal.
+
+          delete init.signal;
+        }
+
+        var request = new NativeRequest(input, init);
+
+        if (signal) {
+          Object.defineProperty(request, 'signal', {
+            writable: false,
+            enumerable: false,
+            configurable: true,
+            value: signal
+          });
+        }
+
+        return request;
+      };
+
+      Request.prototype = NativeRequest.prototype;
+    }
+
+    var realFetch = fetch;
+
+    var abortableFetch = function abortableFetch(input, init) {
+      var signal = Request && Request.prototype.isPrototypeOf(input) ? input.signal : init ? init.signal : undefined;
+
+      if (signal) {
+        var abortError;
+
+        try {
+          abortError = new DOMException('Aborted', 'AbortError');
+        } catch (err) {
+          // IE 11 does not support calling the DOMException constructor, use a
+          // regular error object on it instead.
+          abortError = new Error('Aborted');
+          abortError.name = 'AbortError';
+        } // Return early if already aborted, thus avoiding making an HTTP request
+
+
+        if (signal.aborted) {
+          return Promise.reject(abortError);
+        } // Turn an event into a promise, reject it once `abort` is dispatched
+
+
+        var cancellation = new Promise(function (_, reject) {
+          signal.addEventListener('abort', function () {
+            return reject(abortError);
+          }, {
+            once: true
+          });
+        });
+
+        if (init && init.signal) {
+          // Never pass .signal to the native implementation when the polyfill has
+          // been installed because if we're running on top of a browser with a
+          // working native AbortController (i.e. the polyfill was installed due to
+          // __FORCE_INSTALL_ABORTCONTROLLER_POLYFILL being set), then passing our
+          // fake AbortSignal to the native fetch will trigger:
+          // TypeError: Failed to execute 'fetch' on 'Window': member signal is not of type AbortSignal.
+          delete init.signal;
+        } // Return the fastest promise (don't need to wait for request to finish)
+
+
+        return Promise.race([cancellation, realFetch(input, init)]);
+      }
+
+      return realFetch(input, init);
+    };
+
+    return {
+      fetch: abortableFetch,
+      Request: Request
+    };
+  }
+
+  (function (self) {
+
+    if (!polyfillNeeded(self)) {
+      return;
+    }
+
+    if (!self.fetch) {
+      console.warn('fetch() is not available, cannot install abortcontroller-polyfill');
+      return;
+    }
+
+    var _abortableFetch = abortableFetchDecorator(self),
+      fetch = _abortableFetch.fetch,
+      Request = _abortableFetch.Request;
+
+    self.fetch = fetch;
+    self.Request = Request;
+    Object.defineProperty(self, 'AbortController', {
+      writable: true,
+      enumerable: false,
+      configurable: true,
+      value: AbortController
+    });
+    Object.defineProperty(self, 'AbortSignal', {
+      writable: true,
+      enumerable: false,
+      configurable: true,
+      value: AbortSignal
+    });
+  })(typeof self !== 'undefined' ? self : global);
+
+}));
diff --git a/_prototypes/your-household-v13/assets/lib/array-find-polyfill.js b/_prototypes/your-household-v13/assets/lib/array-find-polyfill.js
new file mode 100644
index 0000000000..c289597c09
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/array-find-polyfill.js
@@ -0,0 +1,46 @@
+// https://tc39.github.io/ecma262/#sec-array.prototype.find
+if (!Array.prototype.find) {
+  Object.defineProperty(Array.prototype, 'find', {
+    value: function(predicate) {
+      // 1. Let O be ? ToObject(this value).
+      if (this == null) {
+        throw new TypeError('"this" is null or not defined');
+      }
+
+      var o = Object(this);
+
+      // 2. Let len be ? ToLength(? Get(O, "length")).
+      var len = o.length >>> 0;
+
+      // 3. If IsCallable(predicate) is false, throw a TypeError exception.
+      if (typeof predicate !== 'function') {
+        throw new TypeError('predicate must be a function');
+      }
+
+      // 4. If thisArg was supplied, let T be thisArg; else let T be undefined.
+      var thisArg = arguments[1];
+
+      // 5. Let k be 0.
+      var k = 0;
+
+      // 6. Repeat, while k < len
+      while (k < len) {
+        // a. Let Pk be ! ToString(k).
+        // b. Let kValue be ? Get(O, Pk).
+        // c. Let testResult be ToBoolean(? Call(predicate, T, « kValue, k, O »)).
+        // d. If testResult is true, return kValue.
+        var kValue = o[k];
+        if (predicate.call(thisArg, kValue, k, o)) {
+          return kValue;
+        }
+        // e. Increase k by 1.
+        k++;
+      }
+
+      // 7. Return undefined.
+      return undefined;
+    },
+    configurable: true,
+    writable: true
+  });
+}
diff --git a/_prototypes/your-household-v13/assets/lib/array-from-polyfill.js b/_prototypes/your-household-v13/assets/lib/array-from-polyfill.js
new file mode 100644
index 0000000000..9736fb71fe
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/array-from-polyfill.js
@@ -0,0 +1,77 @@
+if (!Array.from) {
+  Array.from = (function () {
+    var toStr = Object.prototype.toString;
+    var isCallable = function (fn) {
+      return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
+    };
+    var toInteger = function (value) {
+      var number = Number(value);
+      if (isNaN(number)) { return 0; }
+      if (number === 0 || !isFinite(number)) { return number; }
+      return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
+    };
+    var maxSafeInteger = Math.pow(2, 53) - 1;
+    var toLength = function (value) {
+      var len = toInteger(value);
+      return Math.min(Math.max(len, 0), maxSafeInteger);
+    };
+
+    // The length property of the from method is 1.
+    return function from(arrayLike/*, mapFn, thisArg */) {
+      // 1. Let C be the this value.
+      var C = this;
+
+      // 2. Let items be ToObject(arrayLike).
+      var items = Object(arrayLike);
+
+      // 3. ReturnIfAbrupt(items).
+      if (arrayLike == null) {
+        throw new TypeError('Array.from requires an array-like object - not null or undefined');
+      }
+
+      // 4. If mapfn is undefined, then let mapping be false.
+      var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
+      var T;
+      if (typeof mapFn !== 'undefined') {
+        // 5. else
+        // 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
+        if (!isCallable(mapFn)) {
+          throw new TypeError('Array.from: when provided, the second argument must be a function');
+        }
+
+        // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
+        if (arguments.length > 2) {
+          T = arguments[2];
+        }
+      }
+
+      // 10. Let lenValue be Get(items, "length").
+      // 11. Let len be ToLength(lenValue).
+      var len = toLength(items.length);
+
+      // 13. If IsConstructor(C) is true, then
+      // 13. a. Let A be the result of calling the [[Construct]] internal method
+      // of C with an argument list containing the single item len.
+      // 14. a. Else, Let A be ArrayCreate(len).
+      var A = isCallable(C) ? Object(new C(len)) : new Array(len);
+
+      // 16. Let k be 0.
+      var k = 0;
+      // 17. Repeat, while k < len… (also steps a - h)
+      var kValue;
+      while (k < len) {
+        kValue = items[k];
+        if (mapFn) {
+          A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
+        } else {
+          A[k] = kValue;
+        }
+        k += 1;
+      }
+      // 18. Let putStatus be Put(A, "length", len, true).
+      A.length = len;
+      // 20. Return A.
+      return A;
+    };
+  }());
+}
diff --git a/_prototypes/your-household-v13/assets/lib/fetch-polyfill.js b/_prototypes/your-household-v13/assets/lib/fetch-polyfill.js
new file mode 100644
index 0000000000..657dd2f42f
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/fetch-polyfill.js
@@ -0,0 +1,462 @@
+(function (self) {
+  'use strict';
+
+  if (self.fetch) {
+    return;
+  }
+
+  var support = {
+    searchParams: 'URLSearchParams' in self,
+    iterable: 'Symbol' in self && 'iterator' in Symbol,
+    blob: 'FileReader' in self && 'Blob' in self && function () {
+      try {
+        new Blob();
+        return true;
+      } catch (e) {
+        return false;
+      }
+    }(),
+    formData: 'FormData' in self,
+    arrayBuffer: 'ArrayBuffer' in self
+  };
+
+  if (support.arrayBuffer) {
+    var viewClasses = ['[object Int8Array]', '[object Uint8Array]', '[object Uint8ClampedArray]', '[object Int16Array]', '[object Uint16Array]', '[object Int32Array]', '[object Uint32Array]', '[object Float32Array]', '[object Float64Array]'];
+
+    var isDataView = function isDataView(obj) {
+      return obj && DataView.prototype.isPrototypeOf(obj);
+    };
+
+    var isArrayBufferView = ArrayBuffer.isView || function (obj) {
+      return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1;
+    };
+  }
+
+  function normalizeName(name) {
+    if (typeof name !== 'string') {
+      name = String(name);
+    }
+    if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
+      throw new TypeError('Invalid character in header field name');
+    }
+    return name.toLowerCase();
+  }
+
+  function normalizeValue(value) {
+    if (typeof value !== 'string') {
+      value = String(value);
+    }
+    return value;
+  }
+
+  // Build a destructive iterator for the value list
+  function iteratorFor(items) {
+    var iterator = {
+      next: function next() {
+        var value = items.shift();
+        return { done: value === undefined, value: value };
+      }
+    };
+
+    if (support.iterable) {
+      iterator[Symbol.iterator] = function () {
+        return iterator;
+      };
+    }
+
+    return iterator;
+  }
+
+  function Headers(headers) {
+    this.map = {};
+
+    if (headers instanceof Headers) {
+      headers.forEach(function (value, name) {
+        this.append(name, value);
+      }, this);
+    } else if (Array.isArray(headers)) {
+      headers.forEach(function (header) {
+        this.append(header[0], header[1]);
+      }, this);
+    } else if (headers) {
+      Object.getOwnPropertyNames(headers).forEach(function (name) {
+        this.append(name, headers[name]);
+      }, this);
+    }
+  }
+
+  Headers.prototype.append = function (name, value) {
+    name = normalizeName(name);
+    value = normalizeValue(value);
+    var oldValue = this.map[name];
+    this.map[name] = oldValue ? oldValue + ',' + value : value;
+  };
+
+  Headers.prototype['delete'] = function (name) {
+    delete this.map[normalizeName(name)];
+  };
+
+  Headers.prototype.get = function (name) {
+    name = normalizeName(name);
+    return this.has(name) ? this.map[name] : null;
+  };
+
+  Headers.prototype.has = function (name) {
+    return this.map.hasOwnProperty(normalizeName(name));
+  };
+
+  Headers.prototype.set = function (name, value) {
+    this.map[normalizeName(name)] = normalizeValue(value);
+  };
+
+  Headers.prototype.forEach = function (callback, thisArg) {
+    for (var name in this.map) {
+      if (this.map.hasOwnProperty(name)) {
+        callback.call(thisArg, this.map[name], name, this);
+      }
+    }
+  };
+
+  Headers.prototype.keys = function () {
+    var items = [];
+    this.forEach(function (value, name) {
+      items.push(name);
+    });
+    return iteratorFor(items);
+  };
+
+  Headers.prototype.values = function () {
+    var items = [];
+    this.forEach(function (value) {
+      items.push(value);
+    });
+    return iteratorFor(items);
+  };
+
+  Headers.prototype.entries = function () {
+    var items = [];
+    this.forEach(function (value, name) {
+      items.push([name, value]);
+    });
+    return iteratorFor(items);
+  };
+
+  if (support.iterable) {
+    Headers.prototype[Symbol.iterator] = Headers.prototype.entries;
+  }
+
+  function consumed(body) {
+    if (body.bodyUsed) {
+      return Promise.reject(new TypeError('Already read'));
+    }
+    body.bodyUsed = true;
+  }
+
+  function fileReaderReady(reader) {
+    return new Promise(function (resolve, reject) {
+      reader.onload = function () {
+        resolve(reader.result);
+      };
+      reader.onerror = function () {
+        reject(reader.error);
+      };
+    });
+  }
+
+  function readBlobAsArrayBuffer(blob) {
+    var reader = new FileReader();
+    var promise = fileReaderReady(reader);
+    reader.readAsArrayBuffer(blob);
+    return promise;
+  }
+
+  function readBlobAsText(blob) {
+    var reader = new FileReader();
+    var promise = fileReaderReady(reader);
+    reader.readAsText(blob);
+    return promise;
+  }
+
+  function readArrayBufferAsText(buf) {
+    var view = new Uint8Array(buf);
+    var chars = new Array(view.length);
+
+    for (var i = 0; i < view.length; i++) {
+      chars[i] = String.fromCharCode(view[i]);
+    }
+    return chars.join('');
+  }
+
+  function bufferClone(buf) {
+    if (buf.slice) {
+      return buf.slice(0);
+    } else {
+      var view = new Uint8Array(buf.byteLength);
+      view.set(new Uint8Array(buf));
+      return view.buffer;
+    }
+  }
+
+  function Body() {
+    this.bodyUsed = false;
+
+    this._initBody = function (body) {
+      this._bodyInit = body;
+      if (!body) {
+        this._bodyText = '';
+      } else if (typeof body === 'string') {
+        this._bodyText = body;
+      } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
+        this._bodyBlob = body;
+      } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
+        this._bodyFormData = body;
+      } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+        this._bodyText = body.toString();
+      } else if (support.arrayBuffer && support.blob && isDataView(body)) {
+        this._bodyArrayBuffer = bufferClone(body.buffer);
+        // IE 10-11 can't handle a DataView body.
+        this._bodyInit = new Blob([this._bodyArrayBuffer]);
+      } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
+        this._bodyArrayBuffer = bufferClone(body);
+      } else {
+        throw new Error('unsupported BodyInit type');
+      }
+
+      if (!this.headers.get('content-type')) {
+        if (typeof body === 'string') {
+          this.headers.set('content-type', 'text/plain;charset=UTF-8');
+        } else if (this._bodyBlob && this._bodyBlob.type) {
+          this.headers.set('content-type', this._bodyBlob.type);
+        } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+          this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
+        }
+      }
+    };
+
+    if (support.blob) {
+      this.blob = function () {
+        var rejected = consumed(this);
+        if (rejected) {
+          return rejected;
+        }
+
+        if (this._bodyBlob) {
+          return Promise.resolve(this._bodyBlob);
+        } else if (this._bodyArrayBuffer) {
+          return Promise.resolve(new Blob([this._bodyArrayBuffer]));
+        } else if (this._bodyFormData) {
+          throw new Error('could not read FormData body as blob');
+        } else {
+          return Promise.resolve(new Blob([this._bodyText]));
+        }
+      };
+
+      this.arrayBuffer = function () {
+        if (this._bodyArrayBuffer) {
+          return consumed(this) || Promise.resolve(this._bodyArrayBuffer);
+        } else {
+          return this.blob().then(readBlobAsArrayBuffer);
+        }
+      };
+    }
+
+    this.text = function () {
+      var rejected = consumed(this);
+      if (rejected) {
+        return rejected;
+      }
+
+      if (this._bodyBlob) {
+        return readBlobAsText(this._bodyBlob);
+      } else if (this._bodyArrayBuffer) {
+        return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer));
+      } else if (this._bodyFormData) {
+        throw new Error('could not read FormData body as text');
+      } else {
+        return Promise.resolve(this._bodyText);
+      }
+    };
+
+    if (support.formData) {
+      this.formData = function () {
+        return this.text().then(decode);
+      };
+    }
+
+    this.json = function () {
+      return this.text().then(JSON.parse);
+    };
+
+    return this;
+  }
+
+  // HTTP methods whose capitalization should be normalized
+  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT'];
+
+  function normalizeMethod(method) {
+    var upcased = method.toUpperCase();
+    return methods.indexOf(upcased) > -1 ? upcased : method;
+  }
+
+  function Request(input, options) {
+    options = options || {};
+    var body = options.body;
+
+    if (input instanceof Request) {
+      if (input.bodyUsed) {
+        throw new TypeError('Already read');
+      }
+      this.url = input.url;
+      this.credentials = input.credentials;
+      if (!options.headers) {
+        this.headers = new Headers(input.headers);
+      }
+      this.method = input.method;
+      this.mode = input.mode;
+      if (!body && input._bodyInit != null) {
+        body = input._bodyInit;
+        input.bodyUsed = true;
+      }
+    } else {
+      this.url = String(input);
+    }
+
+    this.credentials = options.credentials || this.credentials || 'omit';
+    if (options.headers || !this.headers) {
+      this.headers = new Headers(options.headers);
+    }
+    this.method = normalizeMethod(options.method || this.method || 'GET');
+    this.mode = options.mode || this.mode || null;
+    this.referrer = null;
+
+    if ((this.method === 'GET' || this.method === 'HEAD') && body) {
+      throw new TypeError('Body not allowed for GET or HEAD requests');
+    }
+    this._initBody(body);
+  }
+
+  Request.prototype.clone = function () {
+    return new Request(this, { body: this._bodyInit });
+  };
+
+  function decode(body) {
+    var form = new FormData();
+    body.trim().split('&').forEach(function (bytes) {
+      if (bytes) {
+        var split = bytes.split('=');
+        var name = split.shift().replace(/\+/g, ' ');
+        var value = split.join('=').replace(/\+/g, ' ');
+        form.append(decodeURIComponent(name), decodeURIComponent(value));
+      }
+    });
+    return form;
+  }
+
+  function parseHeaders(rawHeaders) {
+    var headers = new Headers();
+    // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
+    // https://tools.ietf.org/html/rfc7230#section-3.2
+    var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
+    preProcessedHeaders.split(/\r?\n/).forEach(function (line) {
+      var parts = line.split(':');
+      var key = parts.shift().trim();
+      if (key) {
+        var value = parts.join(':').trim();
+        headers.append(key, value);
+      }
+    });
+    return headers;
+  }
+
+  Body.call(Request.prototype);
+
+  function Response(bodyInit, options) {
+    if (!options) {
+      options = {};
+    }
+
+    this.type = 'default';
+    this.status = options.status === undefined ? 200 : options.status;
+    this.ok = this.status >= 200 && this.status < 300;
+    this.statusText = 'statusText' in options ? options.statusText : 'OK';
+    this.headers = new Headers(options.headers);
+    this.url = options.url || '';
+    this._initBody(bodyInit);
+  }
+
+  Body.call(Response.prototype);
+
+  Response.prototype.clone = function () {
+    return new Response(this._bodyInit, {
+      status: this.status,
+      statusText: this.statusText,
+      headers: new Headers(this.headers),
+      url: this.url
+    });
+  };
+
+  Response.error = function () {
+    var response = new Response(null, { status: 0, statusText: '' });
+    response.type = 'error';
+    return response;
+  };
+
+  var redirectStatuses = [301, 302, 303, 307, 308];
+
+  Response.redirect = function (url, status) {
+    if (redirectStatuses.indexOf(status) === -1) {
+      throw new RangeError('Invalid status code');
+    }
+
+    return new Response(null, { status: status, headers: { location: url } });
+  };
+
+  self.Headers = Headers;
+  self.Request = Request;
+  self.Response = Response;
+
+  self.fetch = function (input, init) {
+    return new Promise(function (resolve, reject) {
+      var request = new Request(input, init);
+      var xhr = new XMLHttpRequest();
+
+      xhr.onload = function () {
+        var options = {
+          status: xhr.status,
+          statusText: xhr.statusText,
+          headers: parseHeaders(xhr.getAllResponseHeaders() || '')
+        };
+        options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL');
+        var body = 'response' in xhr ? xhr.response : xhr.responseText;
+        resolve(new Response(body, options));
+      };
+
+      xhr.onerror = function () {
+        reject(new TypeError('Network request failed'));
+      };
+
+      xhr.ontimeout = function () {
+        reject(new TypeError('Network request failed'));
+      };
+
+      xhr.open(request.method, request.url, true);
+
+      if (request.credentials === 'include') {
+        xhr.withCredentials = true;
+      } else if (request.credentials === 'omit') {
+        xhr.withCredentials = false;
+      }
+
+      if ('responseType' in xhr && support.blob) {
+        xhr.responseType = 'blob';
+      }
+
+      request.headers.forEach(function (value, name) {
+        xhr.setRequestHeader(name, value);
+      });
+
+      xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit);
+    });
+  };
+  self.fetch.polyfill = true;
+})(typeof self !== 'undefined' ? self : undefined);
diff --git a/_prototypes/your-household-v13/assets/lib/url-search-params-polyfill.js b/_prototypes/your-household-v13/assets/lib/url-search-params-polyfill.js
new file mode 100644
index 0000000000..dac0f50205
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/lib/url-search-params-polyfill.js
@@ -0,0 +1,315 @@
+/**
+ *
+ *
+ * @author Jerry Bendy <jerry@icewingcc.com>
+ * @licence MIT
+ *
+ */
+
+(function(self) {
+  'use strict';
+
+  var nativeURLSearchParams = (self.URLSearchParams && self.URLSearchParams.prototype.get) ? self.URLSearchParams : null,
+    isSupportObjectConstructor = nativeURLSearchParams && (new nativeURLSearchParams({a: 1})).toString() === 'a=1',
+    // There is a bug in safari 10.1 (and earlier) that incorrectly decodes `%2B` as an empty space and not a plus.
+    decodesPlusesCorrectly = nativeURLSearchParams && (new nativeURLSearchParams('s=%2B').get('s') === '+'),
+    __URLSearchParams__ = "__URLSearchParams__",
+    // Fix bug in Edge which cannot encode ' &' correctly
+    encodesAmpersandsCorrectly = nativeURLSearchParams ? (function() {
+      var ampersandTest = new nativeURLSearchParams();
+      ampersandTest.append('s', ' &');
+      return ampersandTest.toString() === 's=+%26';
+    })() : true,
+    prototype = URLSearchParamsPolyfill.prototype,
+    iterable = !!(self.Symbol && self.Symbol.iterator);
+
+  if (nativeURLSearchParams && isSupportObjectConstructor && decodesPlusesCorrectly && encodesAmpersandsCorrectly) {
+    return;
+  }
+
+
+  /**
+   * Make a URLSearchParams instance
+   *
+   * @param {object|string|URLSearchParams} search
+   * @constructor
+   */
+  function URLSearchParamsPolyfill(search) {
+    search = search || "";
+
+    // support construct object with another URLSearchParams instance
+    if (search instanceof URLSearchParams || search instanceof URLSearchParamsPolyfill) {
+      search = search.toString();
+    }
+    this [__URLSearchParams__] = parseToDict(search);
+  }
+
+
+  /**
+   * Appends a specified key/value pair as a new search parameter.
+   *
+   * @param {string} name
+   * @param {string} value
+   */
+  prototype.append = function(name, value) {
+    appendTo(this [__URLSearchParams__], name, value);
+  };
+
+  /**
+   * Deletes the given search parameter, and its associated value,
+   * from the list of all search parameters.
+   *
+   * @param {string} name
+   */
+  prototype['delete'] = function(name) {
+    delete this [__URLSearchParams__] [name];
+  };
+
+  /**
+   * Returns the first value associated to the given search parameter.
+   *
+   * @param {string} name
+   * @returns {string|null}
+   */
+  prototype.get = function(name) {
+    var dict = this [__URLSearchParams__];
+    return name in dict ? dict[name][0] : null;
+  };
+
+  /**
+   * Returns all the values association with a given search parameter.
+   *
+   * @param {string} name
+   * @returns {Array}
+   */
+  prototype.getAll = function(name) {
+    var dict = this [__URLSearchParams__];
+    return name in dict ? dict [name].slice(0) : [];
+  };
+
+  /**
+   * Returns a Boolean indicating if such a search parameter exists.
+   *
+   * @param {string} name
+   * @returns {boolean}
+   */
+  prototype.has = function(name) {
+    return name in this [__URLSearchParams__];
+  };
+
+  /**
+   * Sets the value associated to a given search parameter to
+   * the given value. If there were several values, delete the
+   * others.
+   *
+   * @param {string} name
+   * @param {string} value
+   */
+  prototype.set = function set(name, value) {
+    this [__URLSearchParams__][name] = ['' + value];
+  };
+
+  /**
+   * Returns a string containg a query string suitable for use in a URL.
+   *
+   * @returns {string}
+   */
+  prototype.toString = function() {
+    var dict = this[__URLSearchParams__], query = [], i, key, name, value;
+    for (key in dict) {
+      name = encode(key);
+      for (i = 0, value = dict[key]; i < value.length; i++) {
+        query.push(name + '=' + encode(value[i]));
+      }
+    }
+    return query.join('&');
+  };
+
+  // There is a bug in Safari 10.1 and `Proxy`ing it is not enough.
+  var forSureUsePolyfill = !decodesPlusesCorrectly;
+  var useProxy = (!forSureUsePolyfill && nativeURLSearchParams && !isSupportObjectConstructor && self.Proxy)
+  /*
+   * Apply polifill to global object and append other prototype into it
+   */
+  Object.defineProperty(self, 'URLSearchParams', {
+    value: (useProxy ?
+      // Safari 10.0 doesn't support Proxy, so it won't extend URLSearchParams on safari 10.0
+      new Proxy(nativeURLSearchParams, {
+        construct: function(target, args) {
+          return new target((new URLSearchParamsPolyfill(args[0]).toString()));
+        }
+      }) :
+      URLSearchParamsPolyfill)
+  });
+
+  var USPProto = self.URLSearchParams.prototype;
+
+  USPProto.polyfill = true;
+
+  /**
+   *
+   * @param {function} callback
+   * @param {object} thisArg
+   */
+  USPProto.forEach = USPProto.forEach || function(callback, thisArg) {
+    var dict = parseToDict(this.toString());
+    Object.getOwnPropertyNames(dict).forEach(function(name) {
+      dict[name].forEach(function(value) {
+        callback.call(thisArg, value, name, this);
+      }, this);
+    }, this);
+  };
+
+  /**
+   * Sort all name-value pairs
+   */
+  USPProto.sort = USPProto.sort || function() {
+    var dict = parseToDict(this.toString()), keys = [], k, i, j;
+    for (k in dict) {
+      keys.push(k);
+    }
+    keys.sort();
+
+    for (i = 0; i < keys.length; i++) {
+      this['delete'](keys[i]);
+    }
+    for (i = 0; i < keys.length; i++) {
+      var key = keys[i], values = dict[key];
+      for (j = 0; j < values.length; j++) {
+        this.append(key, values[j]);
+      }
+    }
+  };
+
+  /**
+   * Returns an iterator allowing to go through all keys of
+   * the key/value pairs contained in this object.
+   *
+   * @returns {function}
+   */
+  USPProto.keys = USPProto.keys || function() {
+    var items = [];
+    this.forEach(function(item, name) {
+      items.push(name);
+    });
+    return makeIterator(items);
+  };
+
+  /**
+   * Returns an iterator allowing to go through all values of
+   * the key/value pairs contained in this object.
+   *
+   * @returns {function}
+   */
+  USPProto.values = USPProto.values || function() {
+    var items = [];
+    this.forEach(function(item) {
+      items.push(item);
+    });
+    return makeIterator(items);
+  };
+
+  /**
+   * Returns an iterator allowing to go through all key/value
+   * pairs contained in this object.
+   *
+   * @returns {function}
+   */
+  USPProto.entries = USPProto.entries || function() {
+    var items = [];
+    this.forEach(function(item, name) {
+      items.push([name, item]);
+    });
+    return makeIterator(items);
+  };
+
+
+  if (iterable) {
+    USPProto[self.Symbol.iterator] = USPProto[self.Symbol.iterator] || USPProto.entries;
+  }
+
+
+  function encode(str) {
+    var replace = {
+      '!': '%21',
+      "'": '%27',
+      '(': '%28',
+      ')': '%29',
+      '~': '%7E',
+      '%20': '+',
+      '%00': '\x00'
+    };
+    return encodeURIComponent(str).replace(/[!'\(\)~]|%20|%00/g, function(match) {
+      return replace[match];
+    });
+  }
+
+  function decode(str) {
+    return decodeURIComponent(str.replace(/\+/g, ' '));
+  }
+
+  function makeIterator(arr) {
+    var iterator = {
+      next: function() {
+        var value = arr.shift();
+        return {done: value === undefined, value: value};
+      }
+    };
+
+    if (iterable) {
+      iterator[self.Symbol.iterator] = function() {
+        return iterator;
+      };
+    }
+
+    return iterator;
+  }
+
+  function parseToDict(search) {
+    var dict = {};
+
+    if (typeof search === "object") {
+      for (var key in search) {
+        if (search.hasOwnProperty(key)) {
+          appendTo(dict, key, search[key])
+        }
+      }
+
+    } else {
+      // remove first '?'
+      if (search.indexOf("?") === 0) {
+        search = search.slice(1);
+      }
+
+      var pairs = search.split("&");
+      for (var j = 0; j < pairs.length; j++) {
+        var value = pairs [j],
+          index = value.indexOf('=');
+
+        if (-1 < index) {
+          appendTo(dict, decode(value.slice(0, index)), decode(value.slice(index + 1)));
+
+        } else {
+          if (value) {
+            appendTo(dict, decode(value), '');
+          }
+        }
+      }
+    }
+
+    return dict;
+  }
+
+  function appendTo(dict, name, value) {
+    var val = typeof value === 'string' ? value : (
+      value !== null && value !== undefined && typeof value.toString === 'function' ? value.toString() : JSON.stringify(value)
+    )
+
+    if (name in dict) {
+      dict[name].push(val);
+    } else {
+      dict[name] = [val];
+    }
+  }
+
+})(typeof global !== 'undefined' ? global : (typeof window !== 'undefined' ? window : this));
diff --git a/_prototypes/your-household-v13/assets/modules/abortable-fetch.js b/_prototypes/your-household-v13/assets/modules/abortable-fetch.js
new file mode 100644
index 0000000000..a0ced36c67
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/abortable-fetch.js
@@ -0,0 +1,49 @@
+export default class AbortableFetch {
+  constructor(url, options) {
+    this.url = url;
+    this.options = options;
+    this.controller = new window.AbortController();
+    this.status = 'UNSENT';
+  }
+
+  send() {
+    this.status = 'LOADING';
+
+    return new Promise((resolve, reject) => {
+      abortableFetch(this.url, { signal: this.controller.signal, ...this.options })
+        .then(response => {
+          if (response.status >= 200 && response.status < 300) {
+            this.status = 'DONE';
+            resolve(response);
+          } else {
+            this.status = 'DONE';
+            reject(response);
+          }
+        })
+        .catch(error => {
+          this.status = 'DONE';
+          reject(error);
+        });
+    });
+  }
+
+  abort() {
+    this.controller.abort();
+  }
+}
+
+function abortableFetch(url, options) {
+  return window.fetch(url, options)
+    .then(response => {
+      if (response.ok) {
+        return response;
+      } else {
+        const error = new Error(response.statusText);
+        error.response = response;
+        throw error;
+      }
+    })
+    .catch(error => {
+      throw error;
+    });
+}
diff --git a/_prototypes/your-household-v13/assets/modules/form-body-from-object.js b/_prototypes/your-household-v13/assets/modules/form-body-from-object.js
new file mode 100644
index 0000000000..ac4b357b7d
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/form-body-from-object.js
@@ -0,0 +1,3 @@
+export default function formBodyFromObject(object) {
+  return Object.keys(object).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(object[key])}`).join('&');
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/abortable-fetch.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/abortable-fetch.js
new file mode 100644
index 0000000000..a0ced36c67
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/abortable-fetch.js
@@ -0,0 +1,49 @@
+export default class AbortableFetch {
+  constructor(url, options) {
+    this.url = url;
+    this.options = options;
+    this.controller = new window.AbortController();
+    this.status = 'UNSENT';
+  }
+
+  send() {
+    this.status = 'LOADING';
+
+    return new Promise((resolve, reject) => {
+      abortableFetch(this.url, { signal: this.controller.signal, ...this.options })
+        .then(response => {
+          if (response.status >= 200 && response.status < 300) {
+            this.status = 'DONE';
+            resolve(response);
+          } else {
+            this.status = 'DONE';
+            reject(response);
+          }
+        })
+        .catch(error => {
+          this.status = 'DONE';
+          reject(error);
+        });
+    });
+  }
+
+  abort() {
+    this.controller.abort();
+  }
+}
+
+function abortableFetch(url, options) {
+  return window.fetch(url, options)
+    .then(response => {
+      if (response.ok) {
+        return response;
+      } else {
+        const error = new Error(response.statusText);
+        error.response = response;
+        throw error;
+      }
+    })
+    .catch(error => {
+      throw error;
+    });
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/form-body-from-object.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/form-body-from-object.js
new file mode 100644
index 0000000000..ac4b357b7d
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/form-body-from-object.js
@@ -0,0 +1,3 @@
+export default function formBodyFromObject(object) {
+  return Object.keys(object).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(object[key])}`).join('&');
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead-helpers.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead-helpers.js
new file mode 100644
index 0000000000..800c4e5155
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead-helpers.js
@@ -0,0 +1,11 @@
+export function sanitiseTypeaheadText(string, sanitisedQueryReplaceChars = [], trimEnd = true) {
+  let sanitisedString = string.toLowerCase().replace(/\s\s+/g, ' ');
+
+  sanitisedString = trimEnd ? sanitisedString.trim() : sanitisedString.trimStart();
+
+  sanitisedQueryReplaceChars.forEach(char => {
+    sanitisedString = sanitisedString.replace(new RegExp(char, 'g'), '');
+  });
+
+  return sanitisedString;
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.component.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.component.js
new file mode 100644
index 0000000000..571f762326
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.component.js
@@ -0,0 +1,406 @@
+import EventEmitter from 'events';
+import {sanitiseTypeaheadText} from './typeahead-helpers';
+
+const classTypeaheadCombobox = 'js-typeahead-combobox';
+const classTypeaheadLabel = 'js-typeahead-label';
+const classTypeaheadInput = 'js-typeahead-input';
+const classTypeaheadInstructions = 'js-typeahead-instructions';
+const classTypeaheadListbox = 'js-typeahead-listbox';
+const classTypeaheadAriaStatus = 'js-typeahead-aria-status';
+
+const classTypeaheadOption = 'typeahead__option';
+const classTypeaheadOptionFocused = `${classTypeaheadOption}--focused`;
+const classTypeaheadOptionNoResults = `${classTypeaheadOption}--no-results`;
+const classTypeaheadOptionMoreResults = `${classTypeaheadOption}--more-results`;
+const classTypeaheadComboboxFocused = 'typeahead__combobox--focused';
+const classTypeaheadHasResults = 'typeahead--has-results';
+
+const KEYCODE = {
+  BACK_SPACE: 8,
+  RETURN: 13,
+  ENTER: 14,
+  LEFT: 37,
+  UP: 38,
+  RIGHT: 39,
+  DOWN: 40,
+  DELETE: 46,
+  V: 86
+};
+
+export const NEW_FIELD_VALUE_EVENT = 'NEW_FIELD_VALUE';
+export const NEW_ITEM_SELECTED_EVENT = 'NEW_ITEM_SELECTED';
+export const UNSET_FIELD_VALUE_EVENT = 'UNSET_FIELD_VALUE';
+
+export default class TypeaheadComponent {
+  emitter = new EventEmitter();
+
+  constructor({
+    context,
+    apiUrl,
+    minChars,
+    resultLimit,
+    sanitisedQueryReplaceChars = [],
+    lang = null}) {
+
+    // DOM Elements
+    this.context = context;
+    this.combobox = context.querySelector(`.${classTypeaheadCombobox}`);
+    this.label = context.querySelector(`.${classTypeaheadLabel}`);
+    this.input = context.querySelector(`.${classTypeaheadInput}`);
+    this.listbox = context.querySelector(`.${classTypeaheadListbox}`);
+    this.instructions = context.querySelector(`.${classTypeaheadInstructions}`);
+    this.ariaStatus = context.querySelector(`.${classTypeaheadAriaStatus}`);
+
+    // Suggestion URL
+    this.apiUrl = apiUrl || context.getAttribute('data-api-url');
+
+    // Settings
+    this.content = JSON.parse(context.getAttribute('data-content'));
+    this.listboxId = this.listbox.getAttribute('id');
+    this.minChars = minChars || 2;
+    this.resultLimit = resultLimit || null;
+
+    // State
+    this.ctrlKey = false;
+    this.deleting = false;
+    this.query = '';
+    this.sanitisedQuery = '';
+    this.previousQuery = '';
+    this.results = [];
+    this.resultOptions = [];
+    this.foundResults = 0;
+    this.numberOfResults = 0;
+    this.highlightedResultIndex = 0;
+    this.settingResult = false;
+    this.resultSelected = false;
+    this.blurring = false;
+    this.blurTimeout = null;
+    this.sanitisedQueryReplaceChars = sanitisedQueryReplaceChars;
+    this.lang = lang || document.documentElement.getAttribute('lang').toLowerCase();
+
+    // Modify DOM
+    this.label.setAttribute('for', this.input.getAttribute('id'));
+    this.input.setAttribute('aria-autocomplete', 'list');
+    this.input.setAttribute('aria-controls', this.listbox.getAttribute('id'));
+    this.input.setAttribute('aria-describedby', this.instructions.getAttribute('id'));
+    this.input.setAttribute('autocomplete', this.input.getAttribute('data-autocomplete'));
+    this.context.classList.add('typeahead--initialised');
+
+    // Bind event listeners
+    this.bindEventListeners();
+  }
+
+  bindEventListeners() {
+    this.input.addEventListener('keydown', this.handleKeydown.bind(this));
+    this.input.addEventListener('keyup', this.handleKeyup.bind(this));
+    this.input.addEventListener('input', this.handleChange.bind(this));
+    this.input.addEventListener('focus', this.handleFocus.bind(this));
+    this.input.addEventListener('blur', this.handleBlur.bind(this));
+
+    this.listbox.addEventListener('mouseover', this.handleMouseover.bind(this));
+    this.listbox.addEventListener('mouseout', this.handleMouseout.bind(this));
+  }
+
+  handleKeydown(event) {
+    this.ctrlKey = ((event.ctrlKey || event.metaKey) && event.keyCode !== KEYCODE.V);
+
+    switch (event.keyCode) {
+      case KEYCODE.UP: {
+        event.preventDefault();
+        this.navigateResults(-1);
+        break;
+      }
+      case KEYCODE.DOWN: {
+        event.preventDefault();
+        this.navigateResults(1);
+        break;
+      }
+      case KEYCODE.ENTER:
+      case KEYCODE.RETURN: {
+        event.preventDefault();
+        break;
+      }
+    }
+  }
+
+  handleKeyup(event) {
+    switch (event.keyCode) {
+      case KEYCODE.UP:
+      case KEYCODE.DOWN: {
+        event.preventDefault();
+        break;
+      }
+      case KEYCODE.ENTER:
+      case KEYCODE.RETURN: {
+        this.selectResult();
+        break;
+      }
+      case KEYCODE.LEFT:
+      case KEYCODE.RIGHT: {
+        break;
+      }
+    }
+
+    this.ctrlKey = false;
+  }
+
+  handleChange() {
+    if (!this.blurring) {
+      this.valueChanged();
+    }
+  }
+
+  handleFocus() {
+    clearTimeout(this.blurTimeout);
+    this.combobox.classList.add(classTypeaheadComboboxFocused);
+  }
+
+  handleBlur() {
+    clearTimeout(this.blurTimeout);
+    this.blurring = true;
+
+    this.blurTimeout = setTimeout(() => {
+      this.combobox.classList.remove(classTypeaheadComboboxFocused);
+      this.blurring = false;
+    }, 0);
+  }
+
+  handleMouseover() {
+    const focusedItem = this.resultOptions[this.highlightedResultIndex];
+
+    if (focusedItem) {
+      focusedItem.classList.remove(classTypeaheadOptionFocused);
+    }
+  }
+
+  handleMouseout() {
+    const focusedItem = this.resultOptions[this.highlightedResultIndex];
+
+    if (focusedItem) {
+      focusedItem.classList.add(classTypeaheadOptionFocused);
+    }
+  }
+
+  navigateResults(direction) {
+    let index = 0;
+
+    if (this.highlightedResultIndex !== null) {
+      index = this.highlightedResultIndex + direction;
+    }
+
+    if (index < this.numberOfResults) {
+      if (index < 0) {
+        index = null;
+      }
+
+      this.setHighlightedResult(index);
+    }
+  }
+
+  valueChanged(force) {
+    if (!this.settingResult) {
+      const query = this.input.value;
+      const sanitisedQuery = sanitiseTypeaheadText(query, this.sanitisedQueryReplaceChars);
+
+      if (sanitisedQuery !== this.sanitisedQuery || (force && !this.resultSelected)) {
+        this.unsetResults();
+        this.setAriaStatus();
+
+        this.query = query;
+        this.sanitisedQuery = sanitisedQuery;
+
+        if (this.sanitisedQuery.length >= this.minChars) {
+          this.emitter.emit(NEW_FIELD_VALUE_EVENT, sanitisedQuery);
+        } else {
+          this.clearListbox();
+        }
+      }
+    }
+  }
+
+  unsetResults() {
+    this.results = [];
+    this.resultOptions = [];
+    this.resultSelected = false;
+
+    this.emitter.emit(UNSET_FIELD_VALUE_EVENT);
+  }
+
+  clearListbox(preventAriaStatusUpdate) {
+    this.listbox.innerHTML = '';
+    this.context.classList.remove(classTypeaheadHasResults);
+    this.input.removeAttribute('aria-activedescendant');
+    this.combobox.removeAttribute('aria-expanded');
+
+    if (!preventAriaStatusUpdate) {
+      this.setAriaStatus();
+    }
+  }
+
+  updateData(dataMap) {
+    this.results = dataMap.results;
+    this.foundResults = dataMap.totalResults;
+    this.numberOfResults = Math.max(this.results.length, 0);
+
+    this.render();
+  }
+
+  render() {
+    if (!this.deleting || (this.numberOfResults && this.deleting)) {
+      if (this.numberOfResults.length === 1 && this.results[0].sanitisedText === this.sanitisedQuery) {
+        this.clearListbox(true);
+        this.selectResult(0);
+      } else {
+        this.listbox.innerHTML = '';
+        this.resultOptions = this.results.map((result, index) => {
+          let ariaLabel = result[this.lang];
+          let innerHTML = this.emboldenMatch(ariaLabel, this.query);
+
+          if (Array.isArray(result.sanitisedAlternatives)) {
+            const alternativeMatch = result.sanitisedAlternatives.find(alternative => alternative !== result.sanitisedText && alternative.includes(this.sanitisedQuery));
+
+            if (alternativeMatch) {
+              const alternativeText = result.alternatives[result.sanitisedAlternatives.indexOf(alternativeMatch)];
+              innerHTML += ` <small>(${this.emboldenMatch(alternativeText, this.query)})</small>`;
+              ariaLabel += `, (${alternativeText})`;
+            }
+          }
+
+          const listElement = document.createElement('li');
+          listElement.className = classTypeaheadOption;
+          listElement.setAttribute('id', `${this.listboxId}__option--${index}`);
+          listElement.setAttribute('role', 'option');
+          listElement.setAttribute('tabindex', '-1');
+          listElement.setAttribute('aria-label', ariaLabel);
+          listElement.innerHTML = innerHTML;
+
+          listElement.addEventListener('click', () => {
+            this.selectResult(index);
+          });
+
+          return listElement;
+        });
+
+        this.resultOptions.forEach(listElement => this.listbox.appendChild(listElement));
+
+        if (this.numberOfResults < this.foundResults) {
+          const listElement = document.createElement('li');
+          listElement.className = `${classTypeaheadOption} ${classTypeaheadOptionMoreResults} u-fs-b`;
+          listElement.setAttribute('tabindex', '-1');
+          listElement.setAttribute('aria-hidden', 'true');
+          listElement.innerHTML = this.content.more_results;
+          this.listbox.appendChild(listElement);
+        }
+
+        this.setHighlightedResult(null);
+        this.combobox.setAttribute('aria-expanded', true);
+        this.context.classList.add(classTypeaheadHasResults);
+      }
+    }
+
+    if (this.numberOfResults === 0 && this.content.no_results) {
+      this.listbox.innerHTML = `<li class="${classTypeaheadOption} ${classTypeaheadOptionNoResults}">${this.content.no_results}</li>`;
+      this.combobox.setAttribute('aria-expanded', true);
+      this.context.classList.add(classTypeaheadHasResults);
+    }
+  }
+
+  setHighlightedResult(index) {
+    this.highlightedResultIndex = index;
+
+    if (this.setHighlightedResult === null) {
+      this.input.removeAttribute('aria-activedescendant');
+    } else if (this.numberOfResults) {
+      this.resultOptions.forEach((option, optionIndex) => {
+        if (optionIndex === index) {
+          option.classList.add(classTypeaheadOptionFocused);
+          option.setAttribute('aria-selected', true);
+          this.input.setAttribute('aria-activedescendant', option.getAttribute('id'));
+        } else {
+          option.classList.remove(classTypeaheadOptionFocused);
+          option.removeAttribute('aria-selected');
+        }
+      });
+
+      this.setAriaStatus();
+    }
+  }
+
+  setAriaStatus(content) {
+    if (!content) {
+      const queryTooShort = this.sanitisedQuery.length < this.minChars;
+      const noResults = this.numberOfResults === 0;
+
+      if (queryTooShort) {
+        content = this.content.aria_min_chars;
+      } else if (noResults) {
+        content = `${this.content.aria_no_results}: "${this.query}"`;
+      } else if (this.numberOfResults === 1) {
+        content = this.content.aria_one_result;
+      } else {
+        content = this.content.aria_n_results.replace('{n}', this.numberOfResults);
+
+        if (this.resultLimit && this.foundResults > this.resultLimit) {
+          content += ` ${this.content.aria_limited_results}`;
+        }
+      }
+    }
+
+    this.ariaStatus.innerHTML = content;
+  }
+
+  selectResult(index) {
+    if (this.results.length) {
+      //this.settingResult = true;
+
+      const result = this.results[index || this.highlightedResultIndex || 0];
+
+      // TODO: This condition should be removed if we go with the internal address lookup API, or made configurable if we use a third party API
+      if (result.type !== 'Postcode') {
+        this.input.value = result[this.lang];
+        this.query = result[this.lang];
+      }
+
+      this.resultSelected = true;
+
+      this.emitter.emit(NEW_ITEM_SELECTED_EVENT, result);
+
+      /*this.onSelect(result).then(() => {
+        this.settingResult = false;
+        // this.input.setAttribute('autocomplete', 'false');
+      });*/
+
+      let ariaAlternativeMessage = '';
+
+      if (!result.sanitisedText.includes(this.sanitisedQuery) && result.sanitisedAlternatives) {
+        const alternativeMatch = result.sanitisedAlternatives.find(alternative => alternative.includes(this.sanitisedQuery));
+
+        if (alternativeMatch) {
+          ariaAlternativeMessage = `, ${this.content.aria_found_by_alternative_name}: ${alternativeMatch}`;
+        }
+      }
+
+      const ariaMessage = `${this.content.aria_you_have_selected}: ${result[this.lang]}${ariaAlternativeMessage}.`;
+
+      this.clearListbox();
+      this.setAriaStatus(ariaMessage);
+    }
+  }
+
+  emboldenMatch(string, query) {
+    query = query.toLowerCase().trim();
+
+    if (string.toLowerCase().includes(query)) {
+      const queryLength = query.length;
+      const matchIndex = string.toLowerCase().indexOf(query);
+      const matchEnd = matchIndex + queryLength;
+      const before = string.substr(0, matchIndex);
+      const match = string.substr(matchIndex, queryLength);
+      const after = string.substr(matchEnd, string.length - matchEnd);
+
+      return `${before}<em>${match}</em>${after}`;
+    } else {
+      return string;
+    }
+  }
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.container.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.container.js
new file mode 100644
index 0000000000..f4b4371243
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.container.js
@@ -0,0 +1,44 @@
+import TypeaheadComponent, {
+  NEW_FIELD_VALUE_EVENT,
+  NEW_ITEM_SELECTED_EVENT,
+  UNSET_FIELD_VALUE_EVENT
+} from './typeahead.component';
+import TypeaheadService from './typeahead.service';
+import typeaheadDataMap from './typeahead.service-data-map';
+
+export default class TypeaheadContainer {
+  constructor(context) {
+    this.typeahead = new TypeaheadComponent({ context });
+
+    this.service = new TypeaheadService({
+      apiUrl: this.typeahead.apiUrl,
+      lang: document.documentElement.getAttribute('lang').toLowerCase(),
+      sanitisedQueryReplaceChars: this.typeahead.sanitisedQueryReplaceChars
+    });
+
+    this.typeahead.emitter.on(NEW_FIELD_VALUE_EVENT, value => {
+
+      /**
+       * Call service, partially apply config for promise callbacks
+       */
+      this.service.get(value)
+        .then(typeaheadDataMap.bind(null, {
+          query: value,
+          lang: this.typeahead.lang,
+          sanitisedQueryReplaceChars: this.typeahead.sanitisedQueryReplaceChars
+        }))
+        .then(this.typeahead.updateData.bind(this.typeahead))
+        .catch(error => {
+          if (error.name !== 'AbortError') {
+            console.log('TypeaheadService error: ', error, 'query: ', value);
+          }
+        });
+    });
+
+    this.code = context.querySelector('.js-typeahead-code');
+
+    this.typeahead.emitter.on(NEW_ITEM_SELECTED_EVENT, value => (this.code.value = value.code));
+
+    this.typeahead.emitter.on(UNSET_FIELD_VALUE_EVENT, () => (this.code.value = ''));
+  }
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.css b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.css
new file mode 100644
index 0000000000..64925be718
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.css
@@ -0,0 +1,114 @@
+.typeahead {
+    position: relative
+}
+
+.typeahead__combobox {
+    display: inline-block;
+    border-radius: 3px
+}
+
+.typeahead__combobox--focused {
+    -webkit-box-shadow: 0 0 0 3px #fe781f;
+    box-shadow: 0 0 0 3px #fe781f
+}
+
+.typeahead__preview {
+    position: absolute;
+    width: 100%;
+    border-color: transparent;
+    color: #595959;
+    pointer-events: none
+}
+
+.typeahead__listbox {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style: none;
+    border: 1px solid #999;
+    border-top: 0;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px
+}
+
+@media only screen and (min-width: 500px) {
+    .typeahead__listbox:not(.typeahead__listbox--full-width) {
+        width: 19.5rem
+    }
+}
+
+.typeahead__listbox:empty {
+    display: none
+}
+
+.typeahead__option {
+    margin: 0;
+    padding: .5rem;
+    outline: none;
+    cursor: pointer
+}
+
+.typeahead__option:not(:last-child) {
+    border-bottom: 1px solid #999
+}
+
+.typeahead__option--focused:not(.typeahead__option--no-results), .typeahead__option:not(.typeahead__option--no-results):not(.typeahead__option--more-results):hover {
+    border-color: #4263c2;
+    background: #4263c2;
+    color: #fff
+}
+
+.typeahead__option--more-results, .typeahead__option--no-results {
+    background: #ccc;
+    cursor: not-allowed
+}
+
+.typeahead__combobox--focused .typeahead__listbox {
+    border-color: #999
+}
+
+.typeahead:not(.typeahead--initialised) .typeahead__instructions, .typeahead:not(.typeahead--initialised) .typeahead__listbox, .typeahead:not(.typeahead--initialised) .typeahead__preview, .typeahead:not(.typeahead--initialised) .typeahead__status {
+    display: none
+}
+
+.typeahead--initialised .typeahead__input {
+    background: transparent
+}
+
+.typeahead--initialised .typeahead__input:focus {
+    -webkit-box-shadow: none;
+    box-shadow: none
+}
+
+.typeahead--has-results .typeahead__input {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0
+}
+
+.address-input {
+    max-width: 580px
+}
+
+.address-input--search .address-input__manual, .address-input__search {
+    display: none
+}
+
+.address-input--search .address-input__search {
+    display: block
+}
+
+.address-input__typeahead .typeahead__combobox .typeahead__listbox {
+    width: 100%
+}
+
+.address-input__typeahead .typeahead__combobox {
+    display: block
+}
+
+.previous-link {
+    line-height: 1
+}
+
+.field__description {
+    margin-top: 1rem
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.module.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.module.js
new file mode 100644
index 0000000000..05075901a5
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.module.js
@@ -0,0 +1,12 @@
+import TypeaheadContainer from './typeahead.container';
+
+function TypeaheadModule() {
+  const typeaheads = [...document.querySelectorAll('.js-typeahead')];
+
+  typeaheads.forEach(typeahead => new TypeaheadContainer(typeahead));
+}
+
+/**
+ * Temporary - just for prototype, should belong in main/boot file
+ */
+document.addEventListener('TYPEAHEAD-READY', () => new TypeaheadModule());
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service-data-map.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service-data-map.js
new file mode 100644
index 0000000000..8473e98b22
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service-data-map.js
@@ -0,0 +1,35 @@
+import {sanitiseTypeaheadText} from './typeahead-helpers';
+
+export default function typeaheadDataMap(opts, response) {
+
+  /**
+   * Required parameter validation needed
+   */
+
+  return response.json()
+    .then(data => {
+      const results = data.results;
+
+      results.forEach(result => {
+        result.sanitisedText = sanitiseTypeaheadText(result[opts.lang], opts.sanitisedQueryReplaceChars);
+
+        if (opts.lang !== 'en-gb') {
+          const english = result['en-gb'];
+          const sanitisedAlternative = sanitiseTypeaheadText(english, this.sanitisedQueryReplaceChars);
+
+          if (sanitisedAlternative.match(opts.query)) {
+            result.alternatives = [english];
+            result.sanitisedAlternatives = [sanitisedAlternative];
+          }
+        } else {
+          result.alternatives = [];
+          result.sanitisedAlternatives = [];
+        }
+      });
+
+      return {
+        results,
+        totalResults: data.totalResults
+      };
+    });
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service.js b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service.js
new file mode 100644
index 0000000000..9ed7f8937e
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead-refactored/typeahead.service.js
@@ -0,0 +1,42 @@
+import formBodyFromObject from './form-body-from-object';
+import AbortableFetch from './abortable-fetch';
+
+export default class TypeaheadService {
+  requestConfig = {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  };
+
+  constructor({ apiUrl, lang }) {
+    if (!apiUrl || !lang) {
+      throw Error(
+        '[TypeaheadService] \'apiUrl\', \'lang\' parameters are required'
+      );
+    }
+
+    this.apiUrl = apiUrl;
+    this.lang = lang;
+  }
+
+  get(sanitisedQuery) {
+    return new Promise((resolve, reject) => {
+      const query = {
+        query: sanitisedQuery,
+        lang: this.lang
+      };
+
+      if (this.fetch && this.fetch.status !== 'DONE') {
+        this.fetch.abort();
+      }
+
+      this.requestConfig.body = formBodyFromObject(query);
+      this.fetch = new AbortableFetch(this.apiUrl, this.requestConfig);
+
+      this.fetch.send()
+        .then(resolve)
+        .catch(reject);
+    });
+  }
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-core.js b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-core.js
new file mode 100644
index 0000000000..8e9dd15a8a
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-core.js
@@ -0,0 +1,459 @@
+import AbortableFetch from '../abortable-fetch';
+import formBodyFromObject from '../form-body-from-object';
+import {sanitiseTypeaheadText} from './typeahead-helpers';
+
+const classTypeaheadCombobox = 'js-typeahead-combobox';
+const classTypeaheadLabel = 'js-typeahead-label';
+const classTypeaheadInput = 'js-typeahead-input';
+const classTypeaheadInstructions = 'js-typeahead-instructions';
+const classTypeaheadListbox = 'js-typeahead-listbox';
+const classTypeaheadAriaStatus = 'js-typeahead-aria-status';
+
+const classTypeaheadOption = 'typeahead__option';
+const classTypeaheadOptionFocused = `${classTypeaheadOption}--focused`;
+const classTypeaheadOptionNoResults = `${classTypeaheadOption}--no-results`;
+const classTypeaheadOptionMoreResults = `${classTypeaheadOption}--more-results`;
+const classTypeaheadComboboxFocused = 'typeahead__combobox--focused';
+const classTypeaheadHasResults = 'typeahead--has-results';
+
+const KEYCODE = {
+  BACK_SPACE: 8,
+  RETURN: 13,
+  ENTER: 14,
+  LEFT: 37,
+  UP: 38,
+  RIGHT: 39,
+  DOWN: 40,
+  DELETE: 46,
+  V: 86
+};
+
+export default class TypeaheadCore {
+  constructor({context, apiUrl, onSelect, onUnsetResult, onError, minChars, resultLimit, sanitisedQueryReplaceChars = [], suggestionFunction}) {
+    // DOM Elements
+    this.context = context;
+    this.combobox = context.querySelector(`.${classTypeaheadCombobox}`);
+    this.label = context.querySelector(`.${classTypeaheadLabel}`);
+    this.input = context.querySelector(`.${classTypeaheadInput}`);
+    this.listbox = context.querySelector(`.${classTypeaheadListbox}`);
+    this.instructions = context.querySelector(`.${classTypeaheadInstructions}`);
+    this.ariaStatus = context.querySelector(`.${classTypeaheadAriaStatus}`);
+
+    // Suggestion URL
+    this.apiUrl = apiUrl || context.getAttribute('data-api-url');
+
+    // Callbacks
+    this.onSelect = onSelect;
+    this.onUnsetResult = onUnsetResult;
+    this.onError = onError;
+
+    // Settings
+    this.content = JSON.parse(context.getAttribute('data-content'));
+    this.listboxId = this.listbox.getAttribute('id');
+    this.minChars = minChars || 2;
+    this.resultLimit = resultLimit || null;
+
+    if (suggestionFunction) {
+      this.fetchSuggestions = suggestionFunction;
+    }
+
+    // State
+    this.ctrlKey = false;
+    this.deleting = false;
+    this.query = '';
+    this.sanitisedQuery = '';
+    this.previousQuery = '';
+    this.results = [];
+    this.resultOptions = [];
+    this.foundResults = 0;
+    this.numberOfResults = 0;
+    this.highlightedResultIndex = 0;
+    this.settingResult = false;
+    this.resultSelected = false;
+    this.blurring = false;
+    this.blurTimeout = null;
+    this.sanitisedQueryReplaceChars = sanitisedQueryReplaceChars;
+    this.lang = document.documentElement.getAttribute('lang').toLowerCase();
+
+    // Modify DOM
+    this.label.setAttribute('for', this.input.getAttribute('id'));
+    this.input.setAttribute('aria-autocomplete', 'list');
+    this.input.setAttribute('aria-controls', this.listbox.getAttribute('id'));
+    this.input.setAttribute('aria-describedby', this.instructions.getAttribute('id'));
+    this.input.setAttribute('autocomplete', this.input.getAttribute('data-autocomplete'));
+    this.context.classList.add('typeahead--initialised');
+
+    // Bind event listeners
+    this.bindEventListeners();
+  }
+
+  bindEventListeners() {
+    this.input.addEventListener('keydown', this.handleKeydown.bind(this));
+    this.input.addEventListener('keyup', this.handleKeyup.bind(this));
+    this.input.addEventListener('input', this.handleChange.bind(this));
+    this.input.addEventListener('focus', this.handleFocus.bind(this));
+    this.input.addEventListener('blur', this.handleBlur.bind(this));
+
+    this.listbox.addEventListener('mouseover', this.handleMouseover.bind(this));
+    this.listbox.addEventListener('mouseout', this.handleMouseout.bind(this));
+  }
+
+  handleKeydown(event) {
+    this.ctrlKey = ((event.ctrlKey || event.metaKey) && event.keyCode !== KEYCODE.V);
+
+    switch (event.keyCode) {
+      case KEYCODE.UP: {
+        event.preventDefault();
+        this.navigateResults(-1);
+        break;
+      }
+      case KEYCODE.DOWN: {
+        event.preventDefault();
+        this.navigateResults(1);
+        break;
+      }
+      case KEYCODE.ENTER:
+      case KEYCODE.RETURN: {
+        event.preventDefault();
+        break;
+      }
+    }
+  }
+
+  handleKeyup(event) {
+    switch (event.keyCode) {
+      case KEYCODE.UP:
+      case KEYCODE.DOWN: {
+        event.preventDefault();
+        break;
+      }
+      case KEYCODE.ENTER:
+      case KEYCODE.RETURN: {
+        this.selectResult();
+        break;
+      }
+      case KEYCODE.LEFT:
+      case KEYCODE.RIGHT: {
+        break;
+      }
+    }
+
+    this.ctrlKey = false;
+  }
+
+  handleChange() {
+    if (!this.blurring) {
+      this.getSuggestions();
+    }
+  }
+
+  handleFocus() {
+    clearTimeout(this.blurTimeout);
+    this.combobox.classList.add(classTypeaheadComboboxFocused);
+    this.getSuggestions(true);
+  }
+
+  handleBlur() {
+    clearTimeout(this.blurTimeout);
+    this.blurring = true;
+
+    this.blurTimeout = setTimeout(() => {
+      this.combobox.classList.remove(classTypeaheadComboboxFocused);
+      this.blurring = false;
+    }, 300);
+  }
+
+  handleMouseover() {
+    const focusedItem = this.resultOptions[this.highlightedResultIndex];
+
+    if (focusedItem) {
+      focusedItem.classList.remove(classTypeaheadOptionFocused);
+    }
+  }
+
+  handleMouseout() {
+    const focusedItem = this.resultOptions[this.highlightedResultIndex];
+
+    if (focusedItem) {
+      focusedItem.classList.add(classTypeaheadOptionFocused);
+    }
+  }
+
+  navigateResults(direction) {
+    let index = 0;
+
+    if (this.highlightedResultIndex !== null) {
+      index = this.highlightedResultIndex + direction;
+    }
+
+    if (index < this.numberOfResults) {
+      if (index < 0) {
+        index = null;
+      }
+
+      this.setHighlightedResult(index);
+    }
+  }
+
+  getSuggestions(force) {
+    if (!this.settingResult) {
+      const query = this.input.value;
+      const sanitisedQuery = sanitiseTypeaheadText(query, this.sanitisedQueryReplaceChars);
+
+      if (sanitisedQuery !== this.sanitisedQuery || (force && !this.resultSelected)) {
+        this.unsetResults();
+        this.setAriaStatus();
+
+        this.query = query;
+        this.sanitisedQuery = sanitisedQuery;
+
+        if (this.sanitisedQuery.length >= this.minChars) {
+          this.fetchSuggestions(this.sanitisedQuery)
+            .then(this.handleResults.bind(this))
+            .catch(error => {
+              if (error.name !== 'AbortError' && this.onError) {
+                this.onError(error);
+              }
+            });
+        } else {
+          this.clearListbox();
+        }
+      }
+    }
+  }
+
+  fetchSuggestions(sanitisedQuery) {
+    return new Promise((resolve, reject) => {
+      const query = {
+        query: sanitisedQuery,
+        lang: this.lang
+      };
+
+      if (this.fetch && this.fetch.status !== 'DONE') {
+        this.fetch.abort();
+      }
+
+      const body = formBodyFromObject(query);
+
+      this.fetch = new AbortableFetch(this.apiUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        body
+      });
+
+      this.fetch.send()
+        .then(async response => {
+          const data = await response.json();
+
+          const results = data.results;
+
+          results.forEach(result => {
+            result.sanitisedText = sanitiseTypeaheadText(result[this.lang], this.sanitisedQueryReplaceChars);
+
+            if (this.lang !== 'en-gb') {
+              const english = result['en-gb'];
+              const sanitisedAlternative = sanitiseTypeaheadText(english, this.sanitisedQueryReplaceChars);
+
+              if (sanitisedAlternative.match(sanitisedQuery)) {
+                result.alternatives = [english];
+                result.sanitisedAlternatives = [sanitisedAlternative];
+              }
+            } else {
+              result.alternatives = [];
+              result.sanitisedAlternatives = [];
+            }
+          });
+
+          resolve({
+            results,
+            totalResults: data.totalResults
+          });
+        })
+        .catch(reject);
+    });
+  }
+
+  unsetResults() {
+    this.results = [];
+    this.resultOptions = [];
+    this.resultSelected = false;
+
+    if (this.onUnsetResult) {
+      this.onUnsetResult();
+    }
+  }
+
+  clearListbox(preventAriaStatusUpdate) {
+    this.listbox.innerHTML = '';
+    this.context.classList.remove(classTypeaheadHasResults);
+    this.input.removeAttribute('aria-activedescendant');
+    this.combobox.removeAttribute('aria-expanded');
+
+    if (!preventAriaStatusUpdate) {
+      this.setAriaStatus();
+    }
+  }
+
+  handleResults(result) {
+    this.foundResults = result.totalResults;
+    this.results = result.results;
+    this.numberOfResults = Math.max(this.results.length, 0);
+
+    if (!this.deleting || (this.numberOfResults && this.deleting)) {
+      if (this.numberOfResults.length === 1 && this.results[0].sanitisedText === this.sanitisedQuery) {
+        this.clearListbox(true);
+        this.selectResult(0);
+      } else {
+        this.listbox.innerHTML = '';
+        this.resultOptions = this.results.map((result, index) => {
+          let ariaLabel = result[this.lang];
+          let innerHTML = this.emboldenMatch(ariaLabel, this.query);
+
+          if (Array.isArray(result.sanitisedAlternatives)) {
+            const alternativeMatch = result.sanitisedAlternatives.find(alternative => alternative !== result.sanitisedText && alternative.includes(this.sanitisedQuery));
+
+            if (alternativeMatch) {
+              const alternativeText = result.alternatives[result.sanitisedAlternatives.indexOf(alternativeMatch)];
+              innerHTML += ` <small>(${this.emboldenMatch(alternativeText, this.query)})</small>`;
+              ariaLabel += `, (${alternativeText})`;
+            }
+          }
+
+          const listElement = document.createElement('li');
+          listElement.className = classTypeaheadOption;
+          listElement.setAttribute('id', `${this.listboxId}__option--${index}`);
+          listElement.setAttribute('role', 'option');
+          listElement.setAttribute('tabindex', '-1');
+          listElement.setAttribute('aria-label', ariaLabel);
+          listElement.innerHTML = innerHTML;
+
+          listElement.addEventListener('click', () => {
+            this.selectResult(index);
+          });
+
+          this.listbox.appendChild(listElement);
+
+          return listElement;
+        });
+
+        if (this.numberOfResults < this.foundResults) {
+          const listElement = document.createElement('li');
+          listElement.className = `${classTypeaheadOption} ${classTypeaheadOptionMoreResults} u-fs-b`;
+          listElement.setAttribute('tabindex', '-1');
+          listElement.setAttribute('aria-hidden', 'true');
+          listElement.innerHTML = this.content.more_results;
+          this.listbox.appendChild(listElement);
+        }
+
+        this.setHighlightedResult(null);
+        this.combobox.setAttribute('aria-expanded', true);
+        this.context.classList.add(classTypeaheadHasResults);
+      }
+    }
+
+    if (this.numberOfResults === 0 && this.content.no_results) {
+      this.listbox.innerHTML = `<li class="${classTypeaheadOption} ${classTypeaheadOptionNoResults}">${this.content.no_results}</li>`;
+      this.combobox.setAttribute('aria-expanded', true);
+      this.context.classList.add(classTypeaheadHasResults);
+    }
+  }
+
+  setHighlightedResult(index) {
+    this.highlightedResultIndex = index;
+
+    if (this.setHighlightedResult === null) {
+      this.input.removeAttribute('aria-activedescendant');
+    } else if (this.numberOfResults) {
+      this.resultOptions.forEach((option, optionIndex) => {
+        if (optionIndex === index) {
+          option.classList.add(classTypeaheadOptionFocused);
+          option.setAttribute('aria-selected', true);
+          this.input.setAttribute('aria-activedescendant', option.getAttribute('id'));
+        } else {
+          option.classList.remove(classTypeaheadOptionFocused);
+          option.removeAttribute('aria-selected');
+        }
+      });
+
+      this.setAriaStatus();
+    }
+  }
+
+  setAriaStatus(content) {
+    if (!content) {
+      const queryTooShort = this.sanitisedQuery.length < this.minChars;
+      const noResults = this.numberOfResults === 0;
+
+      if (queryTooShort) {
+        content = this.content.aria_min_chars;
+      } else if (noResults) {
+        content = `${this.content.aria_no_results}: "${this.query}"`;
+      } else if (this.numberOfResults === 1) {
+        content = this.content.aria_one_result;
+      } else {
+        content = this.content.aria_n_results.replace('{n}', this.numberOfResults);
+
+        if (this.resultLimit && this.foundResults > this.resultLimit) {
+          content += ` ${this.content.aria_limited_results}`;
+        }
+      }
+    }
+
+    this.ariaStatus.innerHTML = content;
+  }
+
+  selectResult(index) {
+    if (this.results.length) {
+      this.settingResult = true;
+
+      const result = this.results[index || this.highlightedResultIndex || 0];
+
+      // TODO: This condition should be removed if we go with the internal address lookup API, or made configurable if we use a third party API
+      if (result.type !== 'Postcode') {
+        this.input.value = result[this.lang];
+        this.query = result[this.lang];
+      }
+
+      this.resultSelected = true;
+
+      this.onSelect(result).then(() => {
+        this.settingResult = false;
+        // this.input.setAttribute('autocomplete', 'false');
+      });
+
+      let ariaAlternativeMessage = '';
+
+      if (!result.sanitisedText.includes(this.sanitisedQuery) && result.sanitisedAlternatives) {
+        const alternativeMatch = result.sanitisedAlternatives.find(alternative => alternative.includes(this.sanitisedQuery));
+
+        if (alternativeMatch) {
+          ariaAlternativeMessage = `, ${this.content.aria_found_by_alternative_name}: ${alternativeMatch}`;
+        }
+      }
+
+      const ariaMessage = `${this.content.aria_you_have_selected}: ${result[this.lang]}${ariaAlternativeMessage}.`;
+
+      this.clearListbox();
+      this.setAriaStatus(ariaMessage);
+    }
+  }
+
+  emboldenMatch(string, query) {
+    query = query.toLowerCase().trim();
+
+    if (string.toLowerCase().includes(query)) {
+      const queryLength = query.length;
+      const matchIndex = string.toLowerCase().indexOf(query);
+      const matchEnd = matchIndex + queryLength;
+      const before = string.substr(0, matchIndex);
+      const match = string.substr(matchIndex, queryLength);
+      const after = string.substr(matchEnd, string.length - matchEnd);
+
+      return `${before}<em>${match}</em>${after}`;
+    } else {
+      return string;
+    }
+  }
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-helpers.js b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-helpers.js
new file mode 100644
index 0000000000..800c4e5155
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead-helpers.js
@@ -0,0 +1,11 @@
+export function sanitiseTypeaheadText(string, sanitisedQueryReplaceChars = [], trimEnd = true) {
+  let sanitisedString = string.toLowerCase().replace(/\s\s+/g, ' ');
+
+  sanitisedString = trimEnd ? sanitisedString.trim() : sanitisedString.trimStart();
+
+  sanitisedQueryReplaceChars.forEach(char => {
+    sanitisedString = sanitisedString.replace(new RegExp(char, 'g'), '');
+  });
+
+  return sanitisedString;
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.css b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.css
new file mode 100644
index 0000000000..64925be718
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.css
@@ -0,0 +1,114 @@
+.typeahead {
+    position: relative
+}
+
+.typeahead__combobox {
+    display: inline-block;
+    border-radius: 3px
+}
+
+.typeahead__combobox--focused {
+    -webkit-box-shadow: 0 0 0 3px #fe781f;
+    box-shadow: 0 0 0 3px #fe781f
+}
+
+.typeahead__preview {
+    position: absolute;
+    width: 100%;
+    border-color: transparent;
+    color: #595959;
+    pointer-events: none
+}
+
+.typeahead__listbox {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    list-style: none;
+    border: 1px solid #999;
+    border-top: 0;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px
+}
+
+@media only screen and (min-width: 500px) {
+    .typeahead__listbox:not(.typeahead__listbox--full-width) {
+        width: 19.5rem
+    }
+}
+
+.typeahead__listbox:empty {
+    display: none
+}
+
+.typeahead__option {
+    margin: 0;
+    padding: .5rem;
+    outline: none;
+    cursor: pointer
+}
+
+.typeahead__option:not(:last-child) {
+    border-bottom: 1px solid #999
+}
+
+.typeahead__option--focused:not(.typeahead__option--no-results), .typeahead__option:not(.typeahead__option--no-results):not(.typeahead__option--more-results):hover {
+    border-color: #4263c2;
+    background: #4263c2;
+    color: #fff
+}
+
+.typeahead__option--more-results, .typeahead__option--no-results {
+    background: #ccc;
+    cursor: not-allowed
+}
+
+.typeahead__combobox--focused .typeahead__listbox {
+    border-color: #999
+}
+
+.typeahead:not(.typeahead--initialised) .typeahead__instructions, .typeahead:not(.typeahead--initialised) .typeahead__listbox, .typeahead:not(.typeahead--initialised) .typeahead__preview, .typeahead:not(.typeahead--initialised) .typeahead__status {
+    display: none
+}
+
+.typeahead--initialised .typeahead__input {
+    background: transparent
+}
+
+.typeahead--initialised .typeahead__input:focus {
+    -webkit-box-shadow: none;
+    box-shadow: none
+}
+
+.typeahead--has-results .typeahead__input {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0
+}
+
+.address-input {
+    max-width: 580px
+}
+
+.address-input--search .address-input__manual, .address-input__search {
+    display: none
+}
+
+.address-input--search .address-input__search {
+    display: block
+}
+
+.address-input__typeahead .typeahead__combobox .typeahead__listbox {
+    width: 100%
+}
+
+.address-input__typeahead .typeahead__combobox {
+    display: block
+}
+
+.previous-link {
+    line-height: 1
+}
+
+.field__description {
+    margin-top: 1rem
+}
diff --git a/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.js b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.js
new file mode 100644
index 0000000000..96a9c1f85d
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/modules/typeahead/typeahead.js
@@ -0,0 +1,34 @@
+import TypeaheadCore from './typeahead-core';
+
+class Typeahead {
+  constructor(context) {
+    this.context = context;
+    this.typeahead = new TypeaheadCore({
+      context,
+      onSelect: this.onSelect.bind(this),
+      onUnsetResult: this.onUnsetResult.bind(this),
+    });
+
+    this.code = context.querySelector('.js-typeahead-code');
+  }
+
+  onSelect(result) {
+    return new Promise(resolve => {
+      this.code.value = result.code;
+
+      resolve();
+    });
+  }
+
+  onUnsetResult() {
+    this.code.value = '';
+  }
+}
+
+function typeaheads() {
+  const typeaheads = [...document.querySelectorAll('.js-typeahead')];
+
+  typeaheads.forEach(typeahead => new Typeahead(typeahead));
+}
+
+document.addEventListener('TYPEAHEAD-READY', typeaheads);
diff --git a/_prototypes/your-household-v13/assets/numbers-to-words.js b/_prototypes/your-household-v13/assets/numbers-to-words.js
new file mode 100644
index 0000000000..5016db1b60
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/numbers-to-words.js
@@ -0,0 +1,154 @@
+/**
+ * Copied from:
+ * https://codereview.stackexchange.com/questions/90349/changing-number-to-words-in-javascript
+ * ===============
+ */
+var ONE_TO_NINETEEN = [
+  'one', 'two', 'three', 'four', 'five',
+  'six', 'seven', 'eight', 'nine', 'ten',
+  'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen',
+  'sixteen', 'seventeen', 'eighteen', 'nineteen'
+];
+
+var TENS = [
+  'ten', 'twenty', 'thirty', 'forty', 'fifty',
+  'sixty', 'seventy', 'eighty', 'ninety'
+];
+
+var SCALES = ['thousand', 'million', 'billion', 'trillion'];
+
+// helper function for use with Array.filter
+function isTruthy(item) {
+  return !!item;
+}
+
+// convert a number into 'chunks' of 0-999
+function chunk(number) {
+  var thousands = [];
+
+  while(number > 0) {
+    thousands.push(number % 1000);
+    number = Math.floor(number / 1000);
+  }
+
+  return thousands;
+}
+
+// translate a number from 1-999 into English
+function inEnglish(number) {
+  var thousands, hundreds, tens, ones, words = [];
+
+  if(number < 20) {
+    return ONE_TO_NINETEEN[number - 1]; // may be undefined
+  }
+
+  if(number < 100) {
+    ones = number % 10;
+    tens = number / 10 | 0; // equivalent to Math.floor(number / 10)
+
+    words.push(TENS[tens - 1]);
+    words.push(inEnglish(ones));
+
+    return words.filter(isTruthy).join('-');
+  }
+
+  hundreds = number / 100 | 0;
+  words.push(inEnglish(hundreds));
+  words.push('hundred');
+  words.push(inEnglish(number % 100));
+
+  return words.filter(isTruthy).join(' ');
+}
+
+// append the word for a scale. Made for use with Array.map
+function appendScale(chunk, exp) {
+  var scale;
+  if (!chunk) {
+    return null;
+  }
+  scale = SCALES[exp - 1];
+  return [chunk, scale].filter(isTruthy).join(' ');
+}
+
+/**
+ * ===============
+ * End copy
+ */
+
+/**
+ * Modification - decorator
+ */
+var NUMBER_TO_POSITION_TEXT_MAP = {
+  'one': 'first',
+  'two': 'second',
+  'three': 'third',
+  'four': 'fourth',
+  'five': 'fifth',
+  'six': 'sixth',
+  'seven': 'seventh',
+  'eight': 'eighth',
+  'nine': 'ninth',
+  'ten': 'tenth',
+  'eleven': 'eleventh',
+  'twelve': 'twelfth',
+  'thirteen': 'thirteenth',
+  'fourteen': 'fourteenth',
+  'fifteen': 'fifteenth',
+  'sixteen': 'sixteenth',
+  'seventeen': 'seventeenth',
+  'eighteen': 'eighteenth',
+  'nineteen': 'nineteenth',
+
+  'twenty': 'twentieth',
+  'thirty': 'thirtieth',
+  'forty': 'fortieth',
+  'fifty': 'fiftieth',
+  'sixty': 'sixtieth',
+  'seventy': 'seventieth',
+  'eighty': 'eightieth',
+  'ninety': 'ninetieth',
+  'hundred': 'hundredth',
+
+  'thousand': 'thousandth',
+  'million': 'millionth',
+  'billion': 'billionth',
+  'trillion': 'trillionth'
+};
+
+export function numberToPositionWord(num) {
+  const str = chunk(num)
+    .map(inEnglish)
+    .map(appendScale)
+    .filter(isTruthy)
+    .reverse()
+    .join(' ');
+
+  const sub = str.split(' '),
+    lastWordDashSplitArr = sub[sub.length - 1].split('-'),
+    lastWord = lastWordDashSplitArr[lastWordDashSplitArr.length - 1],
+
+    newLastWord = (lastWordDashSplitArr.length > 1? lastWordDashSplitArr[0] + '-' : '') +
+      NUMBER_TO_POSITION_TEXT_MAP[lastWord];
+
+  /*console.log('str:', str);
+  console.log('sub:', sub);
+  console.log('lastWordDashSplitArr:', lastWordDashSplitArr);
+  console.log('lastWord:', lastWord);
+  console.log('newLastWord:', newLastWord);*/
+
+  const subCopy = [].concat(sub);
+  subCopy.pop();
+  const prefix = subCopy.join(' ');
+  const result = (prefix ? prefix + ' ' : '') + newLastWord;
+
+  // console.log('result', (prefix ? prefix + ' ' : '') + newLastWord);
+  return result;
+}
+
+export function numberToWordsStyleguide(number) {
+  if (number > 9) {
+    return number;
+  } 
+
+  return ONE_TO_NINETEEN[number - 1];
+}
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/assets/personal-details.js b/_prototypes/your-household-v13/assets/personal-details.js
new file mode 100644
index 0000000000..e3d7de135d
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/personal-details.js
@@ -0,0 +1,673 @@
+export const PERSONAL_DETAILS_KEY = 'individual-details';
+export const PERSONAL_PINS_KEY = 'individual-pins';
+
+export const personalDetailsMaritalStatusMap = {
+  'never': {
+    description: 'Never married and never registered a same-sex civil' +
+    ' partnership'
+  },
+  'married': {
+    description: 'Married'
+  },
+  'registered': {
+    description: 'In a registered same-sex civil partnership'
+  },
+  'separated-married': {
+    description: 'Separated, but still legally married'
+  },
+  'divorced': {
+    description: 'Divorced'
+  },
+  'former-partnership': {
+    description: 'Formerly in a same-sex civil partnership which is now' +
+    ' legally dissolved'
+  },
+  'widowed': {
+    description: 'Widowed'
+  },
+  'surviving-partner': {
+    description: 'Surviving partner from a same-sex civil partnership'
+  },
+  'separated-partnership': {
+    description: 'Separated, but still legally in a same-sex civil partnership'
+  }
+};
+
+export const personalDetailsCountryMap = {
+  'england': {
+    description: 'England'
+  },
+  'wales': {
+    description: 'Wales'
+  },
+  'scotland': {
+    description: 'Scotland'
+  },
+  'northern-ireland': {
+    description: 'Northern Ireland'
+  },
+  'republic-ireland': {
+    description: 'Republic of Ireland'
+  }
+};
+
+export const personalDetailsOrientationMap = {
+  'straight': {
+    description: 'Straight or Heterosexual'
+  },
+  'gay': {
+    description: 'Gay or Lesbian'
+  },
+  'bisexual': {
+    description: 'Bisexual'
+  },
+  'other': {
+    description: 'Other'
+  },
+  'no-say': {
+    description: 'Prefer not to say'
+  }
+};
+
+export const personalDetailsGenderMap = {
+  'male': {
+    description: 'Male'
+  },
+  'female': {
+    description: 'Female'
+  }
+};
+
+export const personalDetailsNationalIdentityMap = {
+  'english': {
+    description: 'English'
+  },
+  'welsh': {
+    description: 'Welsh'
+  },
+  'scottish': {
+    description: 'Scottish'
+  },
+  'northern-irish': {
+    description: 'Northern Irish'
+  },
+  'british': {
+    description: 'British'
+  }
+};
+
+export const personalDetailsPassportCountriesMap = {
+  'united-kingdom': {
+    description: 'United Kingdom'
+  },
+  'ireland': {
+    description: 'Ireland'
+  },
+  'none': {
+    description: 'None'
+  }
+};
+
+export const personalDetailsEthnicGroupMap = {
+  'white': {
+    'question': 'White',
+    'options': [
+      {
+        val: 'british',
+        label: 'English, Welsh, Scottish, Northern Irish or British'
+      },
+      {
+        val: 'irish',
+        label: 'Irish'
+      },
+      {
+        val: 'gypsy',
+        label: 'Gypsy or Irish Traveler'
+      },
+      {
+        val: 'roma',
+        label: 'Roma'
+      },
+      {
+        val: 'other',
+        label: 'Other White ethnic group or background'
+      }
+    ]
+  },
+  'mixed': {
+    'question': 'Mixed or Multiple',
+    'options': [
+      {
+        val: 'white-black-caribbean',
+        label: 'White and Black Caribbean'
+      },
+      {
+        val: 'white-black-african',
+        label: 'White and Black African'
+      },
+      {
+        val: 'white-asian',
+        label: 'White and Asian'
+      },
+      {
+        val: 'other',
+        label: 'Any other Mixed or Multiple background'
+      }
+    ]
+  },
+  'asian': {
+    'question': 'Asian or Asian British',
+    'options': [
+      {
+        val: 'indian',
+        label: 'Indian'
+      },
+      {
+        val: 'pakistani',
+        label: 'Pakistani'
+      },
+      {
+        val: 'bangladeshi',
+        label: 'Bangladeshi'
+      },
+      {
+        val: 'chinese',
+        label: 'Chinese'
+      },
+      {
+        val: 'other',
+        label: 'Other Asian ethnic group or background'
+      }
+    ]
+  },
+  'black': {
+    'question': 'Black, African, Caribbean or Black British',
+    'options': [
+      {
+        val: 'african',
+        label: 'African'
+      },
+      {
+        val: 'caribbean',
+        label: 'Caribbean'
+      },
+      {
+        val: 'other',
+        label: 'Any other Black, African or Caribbean background'
+      }
+    ]
+  },
+  'other': {
+    'question': 'Other',
+    'options': [
+      {
+        val: 'arab',
+        label: 'Arab'
+      },
+      {
+        val: 'other',
+        label: 'Any other ethnic group'
+      }
+    ]
+  }
+};
+
+export const personalDetailsApprenticeshipMap = {
+  'yes': {
+    description: 'Yes'
+  },
+  'no': {
+    description: 'No'
+  }
+};
+
+export const personalDetailsDegreeAboveMap = {
+  'yes': {
+    description: 'Yes'
+  },
+  'no': {
+    description: 'No'
+  }
+};
+
+export const personalDetailsNVQMap = {
+  'nvq-level-1': {
+    description: 'NVQ level 1 or equivalent'
+  },
+  'nvq-level-2': {
+    description: 'NVQ level 2 or equivalent'
+  },
+  'nvq-level-3': {
+    description: 'NVQ level 3 or equivalent'
+  },
+  'none': {
+    description: 'None'
+  }
+};
+
+export const personalDetailsALevelMap = {
+  'a-level-2': {
+    description: '2 or more A levels'
+  },
+  'a-level-1-btec': {
+    description: '1 A level'
+  },
+  'a-level-1': {
+    description: '1 AS level'
+  },
+  'baccalaureate': {
+    description: 'Advanced Welsh Baccalaureate'
+  },
+  'none': {
+    description: 'None'
+  }
+};
+
+export const personalDetailsGCSEMap = {
+  'gcse-5': {
+    description: '5 or more GCSEs grades A* to C or 9 to 4'
+  },
+  'other-gcses': {
+    description: 'Any other GCSEs'
+  },
+  'basic-skills': {
+    description: 'Basic skills course'
+  },
+  'national-baccalaureate': {
+    description: 'National Welsh Baccalaureate'
+  },
+  'foundation-baccalaureate': {
+    description: 'Foundation Welsh Baccalaureate'
+  },
+  'none': {
+    description: 'None of these apply'
+  }
+};
+
+export const personalDetailsOtherWhere = {
+  'in-england-wales': {
+    description: 'Yes, in England or Wales'
+  },
+  'outside-england-wales': {
+    description: 'Yes, anywhere outside of England and Wales'
+  },
+  'none': {
+    description: 'No qualifications'
+  }
+};
+
+export const personalDetailsEmploymentStatus = {
+  'employee': {
+    description: 'Employee'
+  },
+  'freelance-without-employees': {
+    description: 'Self-employed or freelance without employees'
+  },
+  'freelance-with-employees': {
+    description: 'Self-employed with employees'
+  },
+  'not-employed': {
+    description: 'Not employed'
+  }
+};
+
+function changeDetailsFor(personId, mutation) {
+  let details = getPersonalDetailsFor(personId);
+
+  updatePersonalDetails(personId, {
+    ...details,
+    ...mutation(details || {})
+  });
+
+  return details;
+}
+
+export function addUpdatePersonalDetailsDOB(personId, day, month, year) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'dob': {
+        day,
+        month,
+        year
+      }
+    }));
+}
+
+export function addUpdateMaritalStatus(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'maritalStatus': val
+    }));
+}
+
+export function addUpdateCountry(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'country': {
+        val
+      }
+    }));
+}
+
+export function addUpdateCountryOther(personId, otherText) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'country': {
+        ...(details['country'] || {}),
+        otherText
+      }
+    }));
+}
+
+export function addUpdateNationalIdentity(personId, collection, otherText) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'national-identity': {
+        collection,
+        ...(collection.find(val => val === 'other') ? { otherText } : {})
+      }
+    }));
+}
+
+export function addUpdateNationalIdentityOther(personId, otherText) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'national-identity': {
+        ...(details['national-identity'] || {}),
+        ...{ otherText }
+      }
+    }));
+}
+
+export function addUpdateEthnicGroup(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'ethnic-group': {
+        val
+      }
+    }));
+}
+
+export function addUpdateEthnicGroupDescription(personId, description) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'ethnic-group': {
+        ...(details['ethnic-group'] || {}),
+        ...{ description }
+      }
+    }));
+}
+
+export function addUpdateEthnicGroupOther(personId, otherText) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'ethnic-group': {
+        ...(details['ethnic-group'] || {}),
+        ...{ otherText }
+      }
+    }));
+}
+
+export function addUpdatePassportCountry(personId, countries) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'passport': {
+        ...(details['passport'] || {}),
+        countries
+      }
+    }));
+}
+
+export function addUpdatePassportCountryOther(personId, otherText) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'passport': {
+        ...(details['passport'] || {}),
+        otherText
+      }
+    }));
+}
+
+export function addUpdateOrientation(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'orientation': val
+    }));
+}
+
+export function addUpdateSalary(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'salary': val
+    }));
+}
+
+export function addUpdateSex(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'sex': val
+    }));
+}
+
+export function addUpdateAddressWhere(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'address-where': val
+    }));
+}
+
+export function addUpdateAge(personId, val, { isApproximate = false }) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'age': {
+        val,
+        isApproximate
+      }
+    }));
+}
+
+export function addUpdateAgeConfirm(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'age-confirm': {
+        val
+      }
+    }));
+}
+
+export function addUpdateAddressOutsideUK(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'address-outside-uk': val
+    }));
+}
+
+export function addUpdateAddressIndividual(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'address': val
+    }));
+}
+
+export function addUpdateApprenticeship(personId, hasApprenticeship) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'apprenticeship': {
+        hasApprenticeship
+      }
+    }));
+}
+
+export function addUpdateHasQualificationAbove(personId, aboveDegree) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'qualifications': {
+        ...(details['qualifications'] || {}),
+        aboveDegree
+      }
+    }));
+}
+
+export function addUpdateQualificationsNvqEquivalent(personId, nvqEquivalent) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'qualifications': {
+        ...(details['qualifications'] || {}),
+        nvqEquivalent
+      }
+    }));
+}
+
+export function addUpdateQualificationsALevel(personId, aLevels) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'qualifications': {
+        ...(details['qualifications'] || {}),
+        aLevels
+      }
+    }));
+}
+
+export function addUpdateQualificationsGCSEs(personId, gcses) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'qualifications': {
+        ...(details['qualifications'] || {}),
+        gcses
+      }
+    }));
+}
+
+export function addUpdateQualificationsOtherWhere(personId, othersWhere) {
+  return changeDetailsFor(personId, details =>
+    ({
+      'qualifications': {
+        ...(details['qualifications'] || {}),
+        othersWhere
+      }
+    }));
+}
+
+export function addUpdateEmploymentStatus(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'employment-status': {
+        val
+      }
+    }));
+}
+
+export function addUpdateJobTitle(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'job-title': {
+        val
+      }
+    }));
+}
+
+export function addUpdateJobDescribe(personId, val) {
+  return changeDetailsFor(personId, () =>
+    ({
+      'job-describe': {
+        val
+      }
+    }));
+}
+
+export function getPins() {
+  return JSON.parse(sessionStorage.getItem(PERSONAL_PINS_KEY)) || {};
+}
+
+export function createPinFor(personId, opts = {}) {
+  let pins = getPins();
+
+  pins[personId] = {
+    pin: _.random(10000, 99999),
+    exported: !!opts.exported
+  };
+
+  sessionStorage.setItem(PERSONAL_PINS_KEY, JSON.stringify(pins));
+
+  return pins[personId];
+}
+
+export function getPinFor(personId) {
+  return getPins()[personId];
+}
+
+export function unsetPinFor(personId) {
+  let pins = getPins();
+
+  delete pins[personId];
+
+  sessionStorage.setItem(PERSONAL_PINS_KEY, JSON.stringify(pins));
+}
+
+export function updatePersonalDetails(personId, details) {
+  sessionStorage.setItem(PERSONAL_DETAILS_KEY, JSON.stringify({
+    ...getAllPersonalDetails(),
+    [personId]: details
+  }));
+
+  return details;
+}
+
+export function getAllPersonalDetails() {
+  return JSON.parse(sessionStorage.getItem(PERSONAL_DETAILS_KEY)) || {};
+}
+
+export function getPersonalDetailsFor(personId) {
+  const storageObj = getAllPersonalDetails(),
+    personObj = storageObj[personId];
+
+  if (!personObj) {
+    console.log('Personal details for ' + personId + ' not found');
+  }
+
+  return personObj;
+}
+
+export function removePersonalDetailsFor(personId) {
+  const storageObj = getAllPersonalDetails();
+
+  delete storageObj[personId];
+
+  sessionStorage.setItem(PERSONAL_DETAILS_KEY, JSON.stringify(storageObj));
+}
+
+export function personalBookmark(personId, page) {
+  return changeDetailsFor(personId, () =>
+    ({
+      '_bookmark': {
+        page
+      }
+    }));
+}
+
+export function getBookmarkFor(personId) {
+  return getPersonalDetailsFor(personId)['_bookmark'].page;
+}
+
+export function personalQuestionSubmitDecorator(personId, callback, e) {
+  const urlParams = new URLSearchParams(window.location.search),
+    isEditing = urlParams.get('edit');
+
+  !isEditing
+    ? personalBookmark(personId, window.location.href)
+    : clearPersonalBookmark(personId);
+
+  callback(e);
+}
+
+export function clearPersonalBookmark(personId) {
+  let details = getPersonalDetailsFor(personId);
+
+  delete details._bookmark;
+
+  updatePersonalDetails(personId, {
+    ...details
+  });
+
+  return details;
+}
diff --git a/_prototypes/your-household-v13/assets/prototype-tools.js b/_prototypes/your-household-v13/assets/prototype-tools.js
new file mode 100644
index 0000000000..e27e48071b
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/prototype-tools.js
@@ -0,0 +1,300 @@
+export function tools () {
+
+  const $listLinks = $('.test-data-links'),
+
+    $clearData =
+      $('<li><a href="#" class=\'mock-data-family\'>' +
+        'Clear all data</a></li>'),
+
+    $createFamilyHousehold =
+      $('<li><a href="#" class=\'mock-data-family\'>' +
+        'Create family household</a></li>'),
+
+    $createFamilyRelationships =
+      $('<li><a href="#"' +
+        ' class=\'mock-data-family\'>' +
+        'Create family with relationships</a></li>'),
+
+    $createFamilyWithRelationshipsAndVisitors =
+      $('<li><a href="#"' +
+        ' class=\'mock-data-family\'>' +
+        'Create family with relationships and visitors</a></li>'),
+
+    $createFamilyWithRelationshipsPersonalDetailsAndVisitors =
+      $('<li><a' +
+        ' href="#"' +
+        ' class=\'mock-data-family\'>' +
+        'Create family with relationships, just family individual responses and' +
+        ' visitors</a></li>'),
+
+    $createFamilyWithRelationshipsPersonalDetailsAndVisitorsPersonalDetails =
+      $('<li><a' +
+        ' href="#"' +
+        ' class=\'mock-data-family\'>' +
+        'Create family with relationships, family individual responses and' +
+        ' visitors individual responses</a></li>'),
+
+    familyHouseholdMembersData = [{
+      'type': 'household-member',
+      '@person': {
+        'fullName': 'Dave  Jones',
+        'firstName': 'Dave',
+        'middleName': '',
+        'lastName': 'Jones',
+        'id': 'person_me'
+      }
+    }, {
+      'type':
+        'household-member',
+      '@person': {
+        'fullName': 'Sally  Jones',
+        'firstName': 'Sally',
+        'middleName': '',
+        'lastName': 'Jones',
+        'id': 'person1'
+      }
+    }, {
+      'type': 'household-member',
+      '@person': {
+        'fullName': 'Rebecca  Jones',
+        'firstName': 'Rebecca',
+        'middleName': '',
+        'lastName': 'Jones',
+        'id': 'person2'
+      }
+    }, {
+      'type': 'household-member',
+      '@person': {
+        'fullName': 'Amy Jones',
+        'firstName': 'Amy',
+        'middleName': '',
+        'lastName': 'Jones',
+        'id': 'person3'
+      }
+    }],
+
+    visitorsMemberData = [{
+      'type': 'visitor',
+      '@person': {
+        'fullName': 'Gareth Johnson',
+        'firstName': 'Gareth',
+        'middleName': '',
+        'lastName': 'Johnson',
+        'id': 'person4'
+      }
+    }, {
+      'type': 'visitor',
+      '@person': {
+        'fullName': 'John Hamilton',
+        'firstName': 'John',
+        'middleName': '',
+        'lastName': 'Hamilton',
+        'id': 'person5'
+      }
+    }],
+
+    familyHouseholdRelationshipsData = [{
+      'personIsDescription': 'husband-wife',
+      'personIsId': 'person1',
+      'personToId': 'person_me',
+      'inferred': false,
+      'id': 1
+    }, {
+      'personIsDescription': 'son-daughter',
+      'personIsId': 'person2',
+      'personToId': 'person_me',
+      'inferred': false,
+      'id': 2
+    }, {
+      'personIsDescription': 'mother-father',
+      'personIsId': 'person_me',
+      'personToId': 'person3',
+      'inferred': false,
+      'id': 3
+    }, {
+      'personIsDescription': 'son-daughter',
+      'personIsId': 'person2',
+      'personToId': 'person1',
+      'inferred': false,
+      'id': 4
+    }, {
+      'personIsDescription': 'mother-father',
+      'personIsId': 'person1',
+      'personToId': 'person3',
+      'inferred': false,
+      'id': 5
+    }, {
+      'personIsDescription': 'brother-sister',
+      'personIsId': 'person3',
+      'personToId': 'person2',
+      'inferred': true,
+      'inferredBy': [3, 5, 2, 4],
+      'id': 6
+    }],
+
+    familyPersonalDetails = {
+      'person_me': {
+        'dob': {
+          'day': '17',
+          'month': '4',
+          'year': '1967'
+        },
+        'maritalStatus': 'married',
+        'country': 'wales',
+        'orientation': 'straight',
+        'salary': '40000'
+      },
+      'person1': {
+        'dob': {'day': '02', 'month': '10', 'year': '1965'},
+        'maritalStatus': 'married',
+        'country': 'wales',
+        'orientation': 'straight',
+        'salary': '40000'
+      },
+      'person2': {
+        'dob': {'day': '20', 'month': '5', 'year': '1981'},
+        'maritalStatus': 'never',
+        'country': 'wales',
+        'orientation': 'straight',
+        'salary': '20000'
+      },
+      'person3': {
+        'dob': {'day': '11', 'month': '7', 'year': '1984'},
+        'maritalStatus': 'never',
+        'country': 'wales',
+        'orientation': 'straight',
+        'salary': '20000'
+      }
+    },
+
+    visitorsPersonalDetails = {
+      'person4': {
+        'sex': 'male',
+        'dob': {'day': '20', 'month': '7', 'year': '1990'},
+        'address-where': 'in-uk',
+        'address': {
+          'address-line-1': '15',
+          'address-line-2': 'Somewhere near',
+          'town-city': 'Llandridnod',
+          'county': 'Powys',
+          'postcode': 'LL34 AN5'
+        }
+      },
+      'person5': {
+        'sex': 'male',
+        'dob': {'day': '02', 'month': '5', 'year': '1991'},
+        'address-where': 'out-uk',
+        'address': {
+          'address-line-1': '94',
+          'address-line-2': 'Somewhere Far',
+          'town-city': 'Springfield',
+          'county': 'New York',
+          'postcode': 'NY10A'
+        }
+      }
+    },
+
+    userData = {
+      'fullName': 'Dave  Jones',
+      'firstName': 'Dave',
+      'middleName': '',
+      'lastName': 'Jones'
+    };
+
+  $createFamilyHousehold.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    prerequisites();
+    createFamilyHousehold();
+    window.location.href = '../summary';
+  });
+
+  $createFamilyRelationships.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    prerequisites();
+    createFamilyHousehold();
+    createFamilyRelationships();
+    window.location.href = '../hub';
+  });
+
+  $createFamilyWithRelationshipsAndVisitors.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    prerequisites();
+    createFamilyHouseholdWithVisitors();
+    createFamilyRelationships();
+    window.location.href = '../hub';
+  });
+
+  $createFamilyWithRelationshipsPersonalDetailsAndVisitors.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    prerequisites();
+    createFamilyHouseholdWithVisitors();
+    createFamilyRelationships();
+    createFamilyPersonalDetails();
+    window.location.href = '../hub';
+  });
+
+  $createFamilyWithRelationshipsPersonalDetailsAndVisitorsPersonalDetails.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    prerequisites();
+    createFamilyHouseholdWithVisitors();
+    createFamilyRelationships();
+    createFamilyVisitorsPersonalDetails();
+    window.location.href = '../hub';
+  });
+
+  $clearData.on('click', function(e) {
+    e.preventDefault();
+    clearStorage();
+    window.location.href = '../test-address';
+  });
+
+  function prerequisites() {
+    sessionStorage.setItem('address', '12 Somewhere Close, Newport, CF12 3AB');
+    sessionStorage.setItem('address-line-1', '12');
+    sessionStorage.setItem('address-line-2', 'Somewhere close');
+    sessionStorage.setItem('county', 'Newport');
+    sessionStorage.setItem('lives-here', 'yes');
+    sessionStorage.setItem('postcode', 'CF12 3AB');
+    sessionStorage.setItem('town-city', 'Newport');
+  }
+
+  function createFamilyHousehold() {
+    sessionStorage.setItem('user-details', JSON.stringify(userData));
+    sessionStorage.setItem(window.ONS.storage.KEYS.HOUSEHOLD_MEMBERS_STORAGE_KEY, JSON.stringify(familyHouseholdMembersData));
+    sessionStorage.setItem('household-members-increment', JSON.stringify(4));
+  }
+
+  function createFamilyHouseholdWithVisitors() {
+    sessionStorage.setItem(window.ONS.storage.KEYS.HOUSEHOLD_MEMBERS_STORAGE_KEY, JSON.stringify([
+      ...familyHouseholdMembersData,
+      ...visitorsMemberData
+    ]));
+  }
+
+  function createFamilyRelationships() {
+    sessionStorage.setItem(window.ONS.storage.KEYS.RELATIONSHIPS_STORAGE_KEY, JSON.stringify(familyHouseholdRelationshipsData));
+    sessionStorage.setItem('relationships-increment', JSON.stringify(6));
+  }
+
+  function createFamilyPersonalDetails() {
+    sessionStorage.setItem(window.ONS.storage.KEYS.PERSONAL_DETAILS_KEY, JSON.stringify(familyPersonalDetails));
+  }
+
+  function createFamilyVisitorsPersonalDetails() {
+    sessionStorage.setItem(window.ONS.storage.KEYS.PERSONAL_DETAILS_KEY, JSON.stringify({
+      ...familyPersonalDetails,
+      ...visitorsPersonalDetails
+    }));
+  }
+
+  function clearStorage() {
+    sessionStorage.clear();
+  }
+
+  $listLinks.append($clearData);
+}
diff --git a/_prototypes/your-household-v13/assets/relationships.js b/_prototypes/your-household-v13/assets/relationships.js
new file mode 100644
index 0000000000..37472d7412
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/relationships.js
@@ -0,0 +1,619 @@
+import {autoIncrementId, removeFromList, trailingNameS} from './utils';
+import {
+  isHouseholdMember,
+  getAllHouseholdMembers,
+  getHouseholdMemberByPersonId,
+  USER_HOUSEHOLD_MEMBER_ID
+} from './household';
+
+/**
+ * Augment Underscore library
+ */
+const _ = window._ || {};
+
+export const RELATIONSHIPS_STORAGE_KEY = 'relationships';
+
+export const relationshipTypes = {
+  'spouse': {id: 'spouse'},
+  'child-parent': {id: 'child-parent'},
+  'step-child-parent': {id: 'step-child-parent'},
+  'grandchild-grandparent': {id: 'grandchild-grandparent'},
+  'half-sibling': {id: 'half-sibling'},
+  'sibling': {id: 'sibling'},
+  'step-brother-sister': {id: 'step-brother-sister'},
+  'partner': {id: 'partner'},
+  'unrelated': {id: 'unrelated'},
+  'other-relation': {id: 'other-relation'}
+};
+
+export const relationshipDescriptionMap = {
+  // covered
+  'husband-wife': {
+    sentanceLabel: 'husband or wife',
+    summaryAdjective: 'husband or wife',
+    type: relationshipTypes['spouse']
+  },
+  // covered
+  'mother-father': {
+    sentanceLabel: 'mother or father',
+    summaryAdjective: 'mother or father',
+    type: relationshipTypes['child-parent']
+  },
+  // covered
+  'step-mother-father': {
+    sentanceLabel: 'stepmother or stepfather',
+    summaryAdjective: 'stepmother or stepfather',
+    type: relationshipTypes['step-child-parent']
+  },
+  // covered
+  'son-daughter': {
+    sentanceLabel: 'son or daughter',
+    summaryAdjective: 'son or daughter',
+    type: relationshipTypes['child-parent']
+  },
+  // covered
+  'half-brother-sister': {
+    sentanceLabel: 'half-brother or half-sister',
+    summaryAdjective: 'half-brother or half-sister',
+    type: relationshipTypes['half-sibling']
+  },
+  // covered
+  'step-child': {
+    sentanceLabel: 'stepchild',
+    summaryAdjective: 'stepchild',
+    type: relationshipTypes['step-child-parent']
+  },
+  // covered
+  'grandparent': {
+    sentanceLabel: 'grandparent',
+    summaryAdjective: 'grandparent',
+    type: relationshipTypes['grandchild-grandparent']
+  },
+  // covered
+  'grandchild': {
+    sentanceLabel: 'grandchild',
+    summaryAdjective: 'grandchild',
+    type: relationshipTypes['grandchild-grandparent']
+  },
+  // covered
+  'brother-sister': {
+    sentanceLabel: 'brother or sister',
+    summaryAdjective: 'brother or sister',
+    type: relationshipTypes['sibling']
+  },
+  // covered
+  'step-brother-sister': {
+    sentanceLabel: 'stepbrother or stepsister',
+    summaryAdjective: 'stepbrother or stepsister',
+    type: relationshipTypes['step-brother-sister']
+  },
+  // covered
+  'other-relation': {
+    sentanceLabel: 'other relation',
+    summaryAdjective: 'related',
+    type: relationshipTypes['other-relation']
+  },
+  // covered
+  'partner': {
+    sentanceLabel: 'partner',
+    summaryAdjective: 'partner',
+    type: relationshipTypes['partner']
+  },
+  'same-sex-partner': {
+    sentanceLabel: 'legally registered civil partner',
+    summaryAdjective: 'legally registered civil partner',
+    type: relationshipTypes['partner']
+  },
+  // covered
+  'unrelated': {
+    sentanceLabel: 'unrelated',
+    summaryAdjective: 'unrelated',
+    type: relationshipTypes['unrelated']
+  }
+};
+
+function nameElement(name) {
+  return '<strong>' + name + '</strong>';
+}
+
+function personListStr(peopleArr, opts = {}) {
+  if (peopleArr.length < 1) {
+    console.log(peopleArr, 'not enough people to create a list string');
+    return;
+  }
+
+  if (peopleArr.length === 1) {
+    return nameElement(peopleArr[0].fullName + formatPersonIfYou(peopleArr[0]));
+  }
+
+  let peopleCopy = [...peopleArr],
+    lastPerson = peopleCopy.pop();
+
+  return peopleCopy
+    .map((person) => `${nameElement(person.fullName +
+      (opts.isFamily ? trailingNameS(person.fullName) : '') +
+      formatPersonIfYou(person))}`)
+    .join(', ') + ' and ' + nameElement(lastPerson.fullName +
+      (opts.isFamily ? trailingNameS(lastPerson.fullName) : '') +
+      formatPersonIfYou(lastPerson))
+}
+
+function formatPersonIfYou(person) {
+  return person.id === USER_HOUSEHOLD_MEMBER_ID ? ' (You)' : '';
+}
+
+export const relationshipSummaryTemplates = {
+  'partnership': (person1, person2, description) => {
+    return `${nameElement(person1.fullName + formatPersonIfYou(person1))} is ${nameElement(person2.fullName + trailingNameS(person2.fullName) + formatPersonIfYou(person2))} ${description}`;
+  },
+  'twoFamilyMembersToMany': (parent1, parent2, childrenArr, description) => {
+    return `${nameElement(parent1.fullName + formatPersonIfYou(parent1))} and ${nameElement(parent2.fullName + formatPersonIfYou(parent2))} are ${personListStr(childrenArr, {isFamily: true})} ${description}`;
+  },
+  'oneFamilyMemberToMany': (parent, childrenArr, description) => {
+    console.log(parent, childrenArr, description);
+    return `${nameElement(parent.fullName + formatPersonIfYou(parent))} is ${personListStr(childrenArr, {isFamily: true})} ${description}`;
+  },
+  'manyToMany': (peopleArr1, peopleArr2, description) => {
+    return `${personListStr(peopleArr1)} ${peopleArr1.length > 1 ? 'are' : 'is'} ${description} to ${personListStr(peopleArr2)}`;
+  },
+  'allMutual': (peopleArr, description) => {
+    return `${personListStr(peopleArr)} are ${description}`;
+  }
+};
+
+/**
+ * Types
+ */
+export function relationship(description, personIsId, personToId, opts = {}) {
+  return {
+    personIsDescription: description,
+    personIsId: personIsId,
+    personToId: personToId,
+    inferred: !!opts.inferred,
+    inferredBy: opts.inferredBy
+  };
+}
+
+/**
+ * Storage
+ */
+export function addRelationship(relationshipObj) {
+  let householdRelationships = getAllRelationships() || [],
+    item = {
+      ...relationshipObj,
+      id: autoIncrementId(RELATIONSHIPS_STORAGE_KEY)
+    };
+
+  householdRelationships.push(item);
+
+  sessionStorage.setItem(RELATIONSHIPS_STORAGE_KEY,
+    JSON.stringify(householdRelationships));
+
+  return item;
+}
+
+export function deleteRelationship(relationshipObj) {
+  let householdRelationships = (getAllRelationships() || [])
+    .filter(relationship => relationship.id !== relationshipObj.id);
+
+  sessionStorage.setItem(RELATIONSHIPS_STORAGE_KEY,
+    JSON.stringify(householdRelationships));
+}
+
+export function editRelationship(relationshipId, valueObject) {
+  let householdRelationships = (getAllRelationships() || []).map(function(relationship) {
+    return (relationship.id + '') === (relationshipId + '') ? {
+      ...valueObject,
+      id: relationshipId
+    } : relationship;
+  });
+
+  sessionStorage.setItem(RELATIONSHIPS_STORAGE_KEY,
+    JSON.stringify(householdRelationships));
+}
+
+export function getAllRelationships() {
+  return JSON.parse(sessionStorage.getItem(RELATIONSHIPS_STORAGE_KEY)) || [];
+}
+
+export function getAllManualRelationships() {
+  return getAllRelationships().filter((relationship) => {
+    return !relationship.inferred;
+  });
+}
+
+export function deleteAllRelationshipsForMember(personId) {
+  const householdRelationships = getAllRelationships()
+    .filter((relationship) => {
+      return !(personId === relationship.personIsId || personId === relationship.personToId);
+    });
+
+  sessionStorage.setItem(RELATIONSHIPS_STORAGE_KEY,
+    JSON.stringify(householdRelationships));
+}
+
+/**
+ * Comparators
+ */
+export function isInRelationship(personId, relationship) {
+  return relationship.personToId === personId || relationship.personIsId === personId;
+}
+
+export function isAChildInRelationship(personId, relationship) {
+  /**
+   * Guard
+   */
+  if (!isInRelationship(personId, relationship)) {
+    return false;
+  }
+
+  return (
+    relationship.personIsDescription === 'mother-father' &&
+    relationship.personToId === personId
+  ) || (
+    relationship.personIsDescription === 'son-daughter' &&
+    relationship.personIsId === personId
+  );
+}
+
+export function isASiblingInRelationship(personId, relationship) {
+  return isInRelationship(personId, relationship) &&
+    relationshipDescriptionMap[relationship.personIsDescription].type.id === 'sibling';
+}
+
+export function isAParentInRelationship(personId, relationship) {
+  /**
+   * Guard
+   */
+  if (!isInRelationship(personId, relationship)) {
+    return false;
+  }
+
+  return (
+    relationship.personIsDescription === 'mother-father' &&
+    relationship.personIsId === personId
+  ) || (
+    relationship.personIsDescription === 'son-daughter' &&
+    relationship.personToId === personId
+  );
+}
+
+export function areAnyChildrenInRelationshipNotParent(childrenIds, notParentId, relationship) {
+  /**
+   * Guard
+   * If relationship type is not child-parent
+   */
+  if (relationshipDescriptionMap[relationship.personIsDescription]
+    .type.id !== 'child-parent') {
+
+    return false;
+  }
+
+  let childIndexAsPersonIs = childrenIds.indexOf(relationship.personIsId),
+    childIndexAsPersonTo = childrenIds.indexOf(relationship.personToId);
+
+  /**
+   * Find parents with the same children
+   *
+   * If a personIs-child is not in relationship
+   * or 2 children are found in relationship
+   */
+  if (
+    (childIndexAsPersonIs === -1 && childIndexAsPersonTo === -1) ||
+    (childIndexAsPersonIs !== -1 && childIndexAsPersonTo !== -1)
+  ) {
+    return false;
+  }
+
+  /**
+   * Child must be in relationship, get child index
+   */
+  let childIndex = childIndexAsPersonIs !== -1
+    ? childIndexAsPersonIs
+    : childIndexAsPersonTo;
+
+  /**
+   * If personIs is not in relationship
+   * and child from previous relationship is a child in this relationship
+   */
+  return !isInRelationship(notParentId, relationship) &&
+    isAChildInRelationship(childrenIds[childIndex], relationship);
+}
+
+export function isRelationshipType(relationshipType, relationship) {
+  const typeOfRelationship = relationshipDescriptionMap[relationship.personIsDescription]
+    .type.id;
+
+  /**
+   * relationshipType can be an array of types
+   */
+  return _.isArray(relationshipType)
+    ? !!_.find(relationshipType, function(rType) {
+      return rType === typeOfRelationship;
+    })
+    : typeOfRelationship === relationshipType;
+}
+
+export function isRelationshipInferred(relationship) {
+  return relationship.inferred;
+}
+
+/**
+ * Retrieve people by role in relationships
+ */
+export function getParentIdFromRelationship(relationship) {
+  let parentId;
+
+  if (relationship.personIsDescription === 'mother-father') {
+    parentId = relationship.personIsId;
+  }
+
+  if (relationship.personIsDescription === 'son-daughter') {
+    parentId = relationship.personToId;
+  }
+
+  if (!parentId) {
+    console.log('Parent not found in relationship: ', relationship);
+    return false;
+  }
+
+  return parentId;
+}
+
+export function getChildIdFromRelationship(relationship) {
+  let childId;
+
+  if (relationship.personIsDescription === 'mother-father') {
+    childId = relationship.personToId;
+  }
+
+  if (relationship.personIsDescription === 'son-daughter') {
+    childId = relationship.personIsId;
+  }
+
+  if (!childId) {
+    console.log('Child not found in relationship: ', relationship);
+    return false;
+  }
+
+  return childId;
+}
+
+export function getSiblingIdFromRelationship(personId, relationship) {
+  if (!isInRelationship(personId, relationship)) {
+    console.log('Person ' + personId + ' not found in relationship: ', relationship);
+    return false;
+  }
+
+  return relationship[relationship.personIsId === personId ? 'personToId' : 'personIsId'];
+}
+
+export function getOtherPersonIdFromRelationship(personId, relationship) {
+  return relationship.personIsId === personId
+    ? relationship.personToId : relationship.personIsId;
+}
+
+export function getAllParentsOf(personId) {
+  return getAllRelationships()
+    .filter(isAChildInRelationship.bind(null, personId))
+    .map(relationship => getPersonFromMember(getHouseholdMemberByPersonId(getParentIdFromRelationship(relationship))));
+}
+
+export function getAllChildrenOf(personId) {
+  return getAllRelationships()
+    .filter(isAParentInRelationship.bind(null, personId))
+    .map(relationship => getHouseholdMemberByPersonId(getChildIdFromRelationship(relationship))['@person']);
+}
+
+export function getPersonIdFromPerson(person) {
+  return person.id;
+}
+
+export function getPersonFromMember(member) {
+  return member['@person'];
+}
+
+/**
+ * Missing relationship inference
+ */
+export const missingRelationshipInference = {
+  siblingsOf(subjectMember) {
+
+    const missingRelationships = [],
+      allRelationships = getAllRelationships(),
+      person = getPersonFromMember(subjectMember),
+      personId = person.id,
+
+      parents = getAllParentsOf(personId),
+
+      siblingIds = allRelationships
+        .filter(isASiblingInRelationship.bind(null, personId))
+        .map(getSiblingIdFromRelationship.bind(null, personId));
+
+    /**
+     * If 2 parent relationships of 'person' are found we can attempt to infer
+     * sibling relationships
+     */
+    if (parents.length === 2) {
+
+      getAllHouseholdMembers()
+        .filter(isHouseholdMember)
+        .forEach((member) => {
+
+          const memberPersonId = member['@person'].id;
+
+          /**
+           * Guard
+           * If member is the subject member
+           * or member is a parent
+           * or member already has a sibling relationship with 'person'
+           * skip member
+           */
+          if (memberPersonId === personId ||
+            memberPersonId === parents[0].id || memberPersonId === parents[1].id ||
+            siblingIds.indexOf(memberPersonId) > -1) {
+            return;
+          }
+
+          const memberParents = getAllParentsOf(memberPersonId);
+
+          /**
+           * If 2 parents of 'member' are found
+           * and they are the same parents of 'person'
+           * we have identified a missing inferred relationship
+           */
+          if (memberParents.length === 2 &&
+            _.difference(
+              parents.map(getPersonIdFromPerson),
+              memberParents.map(getPersonIdFromPerson)
+            ).length === 0) {
+
+            /**
+             * Add to missingRelationships
+             */
+            missingRelationships.push(relationship(
+              'brother-sister',
+              personId,
+              memberPersonId,
+              {
+                inferred: true,
+                inferredBy: [
+                  /**
+                   * Must be 4 relationships
+                   * Could have used member's parents but we can assume they
+                   * must be the same at this point or the inferrence
+                   * couldn't happen.
+                   */
+                  getRelationshipOf(personId, parents[0].id).id,
+                  getRelationshipOf(personId, parents[1].id).id,
+                  getRelationshipOf(memberPersonId, parents[0].id).id,
+                  getRelationshipOf(memberPersonId, parents[1].id).id
+                ]
+              }
+            ));
+          }
+        });
+    }
+
+    return missingRelationships;
+  }
+};
+
+export function inferRelationships(relationship, personIs, personTo) {
+  var missingRelationships = [];
+
+  if (relationship.personIsDescription === 'mother-father') {
+    missingRelationships = missingRelationships.concat(
+      missingRelationshipInference.siblingsOf(personTo)
+    );
+  }
+
+  if (relationship.personIsDescription === 'son-daughter') {
+    missingRelationships = missingRelationships.concat(
+      missingRelationshipInference.siblingsOf(personIs)
+    );
+  }
+
+  $.each(missingRelationships, function(i, relationship) {
+    addRelationship(relationship);
+  });
+}
+
+export function findNextMissingRelationship() {
+  let householdMembers = getAllHouseholdMembers().filter(isHouseholdMember),
+    relationships = getAllRelationships(),
+    missingRelationshipMembers = [],
+    personIs = null;
+
+  /**
+   * Find the next missing relationship
+   */
+  $.each(householdMembers, function(i, member) {
+    const personId = member['@person'].id;
+
+    /**
+     * Get all relationships for this member
+     */
+    const memberRelationships = relationships.filter(function(relationship) {
+        return relationship.personIsId === personId || relationship.personToId === personId;
+      }),
+
+      memberRelationshipToIds = memberRelationships.map(function(relationship) {
+        return relationship.personIsId === personId ? relationship.personToId : relationship.personIsId;
+      }) || [];
+
+    /**
+     * If total relationships related to this member isn't equal to
+     * total household members -1, indicates missing relationship
+     */
+    if (memberRelationships.length < householdMembers.length - 1) {
+
+      /**
+       * All missing relationship members
+       */
+      missingRelationshipMembers = householdMembers.filter(function(m) {
+        return memberRelationshipToIds.indexOf(m['@person'].id) === -1 &&
+          m['@person'].id !== personId;
+      });
+
+      personIs = member;
+
+      return false;
+    }
+  });
+
+  return personIs ? {
+    personIs: personIs,
+    personTo: missingRelationshipMembers[0]
+  } : null;
+}
+
+export function getPeopleIdsMissingRelationshipsWithPerson(personId) {
+  const remainingPersonIds = getAllHouseholdMembers()
+    .filter(isHouseholdMember)
+    .map(function(member) {
+      return member['@person'].id;
+    });
+
+  /**
+   * Remove this person from the list
+   */
+  removeFromList(remainingPersonIds, personId);
+
+  $.each(getAllRelationships(), function(i, relationship) {
+    if (!isInRelationship(personId, relationship)) {
+      return;
+    }
+
+    /**
+     * Remove the other person from the remainingPersonIds list
+     */
+    removeFromList(
+      remainingPersonIds,
+      getOtherPersonIdFromRelationship(personId, relationship)
+    );
+  });
+
+  return remainingPersonIds;
+}
+
+export function getRelationshipType(relationship) {
+  return relationshipDescriptionMap[relationship.personIsDescription].type;
+}
+
+/**
+ * Retrieve from relationship group
+ */
+export function getRelationshipsWithPersonIds(relationships, idArr) {
+  return relationships.filter(function(childRelationship) {
+    return idArr.indexOf(childRelationship.personIsId) !== -1 ||
+      idArr.indexOf(childRelationship.personToId) !== -1;
+  });
+}
+
+export function getRelationshipOf(person1, person2) {
+  return getAllRelationships().find(function(relationship) {
+    return isInRelationship(person1, relationship) &&
+      isInRelationship(person2, relationship);
+  });
+}
diff --git a/_prototypes/your-household-v13/assets/utils.js b/_prototypes/your-household-v13/assets/utils.js
new file mode 100644
index 0000000000..c0898a3d80
--- /dev/null
+++ b/_prototypes/your-household-v13/assets/utils.js
@@ -0,0 +1,39 @@
+export function autoIncrementId(collection) {
+  let k = collection + '-increment',
+    id = parseInt(sessionStorage.getItem(k)) || 0;
+
+  id++;
+
+  sessionStorage.setItem(k, JSON.stringify(id));
+
+  return id;
+}
+
+export function removeFromList(list, val) {
+
+  function doRemove(item) {
+    var foundId = list.indexOf(item);
+
+    /**
+     * Guard
+     */
+    if (foundId === -1) {
+      console.log('Attempt to remove from list failed: ', list, val);
+      return;
+    }
+
+    list.splice(foundId, 1);
+  }
+
+  if (_.isArray(val)) {
+    $.each(val, function(i, item) {
+      doRemove(item);
+    });
+  } else {
+    doRemove(val);
+  }
+}
+
+export function trailingNameS(name) {
+  return name[name.length - 1] === 's' ? '\&#x2019;' : '\&#x2019;s';
+}
diff --git a/_prototypes/your-household-v13/bundle.js b/_prototypes/your-household-v13/bundle.js
new file mode 100644
index 0000000000..6f9bc823ba
--- /dev/null
+++ b/_prototypes/your-household-v13/bundle.js
@@ -0,0 +1,667 @@
+/**
+ * Libraries
+ */
+import './assets/lib/FileSaver';
+import './assets/lib/array-from-polyfill';
+import './assets/lib/url-search-params-polyfill';
+import './assets/lib/array-find-polyfill';
+import './assets/lib/CustomEvent-polyfill';
+import './assets/lib/fetch-polyfill';
+import './assets/lib/abortcontroller-polyfill';
+
+/**
+ * DOM modules
+ */
+import './assets/modules/typeahead-refactored/typeahead.module';
+
+import {
+  RELATIONSHIPS_STORAGE_KEY,
+  relationshipDescriptionMap,
+  addRelationship,
+  deleteRelationship,
+  editRelationship,
+  getAllRelationships,
+  getAllManualRelationships,
+  deleteAllRelationshipsForMember,
+  relationshipSummaryTemplates,
+  missingRelationshipInference,
+  inferRelationships,
+  getAllParentsOf,
+  getAllChildrenOf,
+  getParentIdFromRelationship,
+  getChildIdFromRelationship,
+  getOtherPersonIdFromRelationship,
+  isAChildInRelationship,
+  isAParentInRelationship,
+  isInRelationship,
+  areAnyChildrenInRelationshipNotParent,
+  isRelationshipType,
+  isRelationshipInferred,
+  getRelationshipOf,
+  getRelationshipsWithPersonIds,
+  getPeopleIdsMissingRelationshipsWithPerson,
+  getRelationshipType,
+  findNextMissingRelationship,
+  relationship
+} from './assets/relationships';
+import {
+  HOUSEHOLD_MEMBER_TYPE,
+  VISITOR_TYPE,
+  USER_HOUSEHOLD_MEMBER_ID,
+  HOUSEHOLD_MEMBERS_STORAGE_KEY,
+  addHouseholdMember,
+  updateHouseholdMember,
+  deleteHouseholdMember,
+  getAllHouseholdMembers,
+  getUserAsHouseholdMember,
+  getHouseholdMemberByPersonId,
+  getMemberPersonId,
+  updateUserAsHouseholdMember,
+  deleteUserAsHouseholdMember,
+  isVisitor,
+  isOtherHouseholdMember,
+  isHouseholdMember,
+  person,
+  tempAwayQuestionSentenceMap,
+  visitorQuestionSentenceMap
+} from './assets/household';
+import {
+  addUpdatePersonalDetailsDOB,
+  getPersonalDetailsFor,
+  removePersonalDetailsFor,
+  addUpdateMaritalStatus,
+  addUpdateCountry,
+  addUpdateCountryOther,
+  addUpdateNationalIdentity,
+  addUpdateNationalIdentityOther,
+  addUpdateEthnicGroup,
+  addUpdateEthnicGroupDescription,
+  addUpdateEthnicGroupOther,
+  addUpdatePassportCountry,
+  addUpdatePassportCountryOther,
+  addUpdateOrientation,
+  addUpdateSalary,
+  addUpdateSex,
+  addUpdateAddressWhere,
+  addUpdateAddressIndividual,
+  addUpdateAge,
+  addUpdateAgeConfirm,
+  addUpdateAddressOutsideUK,
+  addUpdateApprenticeship,
+  addUpdateHasQualificationAbove,
+  addUpdateQualificationsNvqEquivalent,
+  addUpdateQualificationsALevel,
+  addUpdateQualificationsGCSEs,
+  addUpdateQualificationsOtherWhere,
+  addUpdateEmploymentStatus,
+  addUpdateJobTitle,
+  addUpdateJobDescribe,
+
+  personalDetailsMaritalStatusMap,
+  personalDetailsCountryMap,
+  personalDetailsOrientationMap,
+  personalDetailsGenderMap,
+  personalDetailsNationalIdentityMap,
+  personalDetailsEthnicGroupMap,
+  personalDetailsPassportCountriesMap,
+  personalDetailsApprenticeshipMap,
+  personalDetailsDegreeAboveMap,
+  personalDetailsNVQMap,
+  personalDetailsALevelMap,
+  personalDetailsGCSEMap,
+  personalDetailsOtherWhere,
+  personalDetailsEmploymentStatus,
+
+  PERSONAL_DETAILS_KEY,
+
+  createPinFor,
+  getPinFor,
+  unsetPinFor,
+  personalBookmark,
+  getBookmarkFor,
+  clearPersonalBookmark,
+  personalQuestionSubmitDecorator
+} from './assets/personal-details';
+import { removeFromList, trailingNameS } from './assets/utils';
+
+import { numberToPositionWord, numberToWordsStyleguide } from './assets/numbers-to-words';
+
+import { tools } from './assets/prototype-tools';
+
+export const USER_STORAGE_KEY = 'user-details';
+export const INDIVIDUAL_PROXY_STORAGE_KEY = 'proxy-person';
+
+export function getAddress() {
+  let addressLines = sessionStorage.getItem('address').split(',');
+
+  return {
+    addressLine1: addressLines[0],
+    addressLine2: addressLines[1],
+    addressLine3: addressLines[2],
+    addressCounty: addressLines[4],
+    addressTownCity: addressLines[3],
+    addressPostcode: addressLines[5]
+  }
+}
+
+/**
+ * User
+ */
+export function addUserPerson(person) {
+  sessionStorage.setItem(USER_STORAGE_KEY, JSON.stringify(person));
+}
+
+export function getUserPerson() {
+  return JSON.parse(sessionStorage.getItem(USER_STORAGE_KEY));
+}
+
+/**
+ * Helpers
+ */
+function createNavItem(member) {
+  let $nodeEl = $('<li class="js-template-nav-item nav__item pluto">' +
+    '  <a class="js-template-nav-item-label nav__link" href="#"></a>' +
+    '</li>'),
+    $linkEl = $nodeEl.find('.js-template-nav-item-label');
+
+  $linkEl.html(member['@person'].fullName);
+
+  if (member['@person'].id === USER_HOUSEHOLD_MEMBER_ID) {
+    $linkEl.attr('href', '../what-is-your-name');
+  } else {
+    $linkEl.attr('href', '../who-else-to-add?edit=' + member['@person'].id);
+  }
+
+  return $nodeEl;
+}
+
+function updateHouseholdVisitorsNavigationItems() {
+  let allHouseholdMembers = window.ONS.storage.getAllHouseholdMembers(),
+    householdMembers = allHouseholdMembers.filter(window.ONS.storage.isHouseholdMember),
+    visitors = allHouseholdMembers.filter(window.ONS.storage.isVisitor);
+
+  const $navigationHouseholdMembersEl = $('#navigation-household-members'),
+    $navigationVisitorsEl = $('#navigation-visitors');
+
+  if (householdMembers.length) {
+    $.each(householdMembers, function(i, member) {
+      $navigationHouseholdMembersEl.append(createNavItem(member));
+    });
+  } else {
+    $navigationHouseholdMembersEl.parent().hide();
+  }
+
+  if (visitors.length) {
+    $.each(visitors, function(i, member) {
+      $navigationVisitorsEl.append(createNavItem(member));
+    });
+  } else {
+    $navigationVisitorsEl.parent().hide();
+  }
+}
+
+function createListItemPerson(member) {
+  return $('<li class="list__item">').addClass('mars').html(
+    '<span class="list__item-name">' +
+      member['@person'].fullName +
+      (member['@person'].id === USER_HOUSEHOLD_MEMBER_ID ? ' (You)' : '') +
+    '</span>'
+  );
+}
+
+function populateList($el, memberType) {
+  if (!$el.length) {
+    return;
+  }
+
+  let members = getAllHouseholdMembers() || [];
+
+  $el.empty().append(members.filter((member) => {
+    return member.type === memberType;
+  }).map(createListItemPerson));
+
+  $el.addClass('list list--people-plain');
+}
+
+function populateHouseholdList() {
+  populateList($('#household-members'), HOUSEHOLD_MEMBER_TYPE);
+}
+
+function populateVisitorList() {
+  populateList($('#visitors-list'), VISITOR_TYPE);
+}
+
+function cleanHTMLPlaceholderStringReplacment(el, val) {
+  const $el = $(el),
+    $parent = $el.parent();
+
+  $el.before(val);
+  $el.remove();
+
+  $parent.html($parent.html().replace(/[\s]+/g, ' ').trim());
+}
+
+function updateAddresses() {
+  let addressLines = (sessionStorage.getItem('address') || '').split(','),
+    addressLine1 = addressLines[0],
+    addressLine2 = addressLines[1];
+
+  $('.address-text').each((i, el) => cleanHTMLPlaceholderStringReplacment(el,
+    addressLine1 && addressLine2
+      ? (
+        addressLine1 + (addressLine2 ? ', ' + addressLine2 : '')
+      )
+      : '<a href="../test-address">Address not found</a>'
+  ));
+
+  $('.address-text-line1').each((i, el) => cleanHTMLPlaceholderStringReplacment(el, addressLine1));
+
+  const personId = new URLSearchParams(window.location.search).get('person');
+
+  if (personId) {
+    const person = getHouseholdMemberByPersonId(personId)['@person'],
+      $sectionIndividualEl = $('#section-individual'),
+      $nameEl = $('.js-person-fullname-from-url-id');
+
+    $sectionIndividualEl.length && cleanHTMLPlaceholderStringReplacment($sectionIndividualEl, person.fullName);
+    $nameEl.length && cleanHTMLPlaceholderStringReplacment($nameEl, person.fullName);
+  }
+}
+
+const secureLinkTextMap = {
+  'question-you': {
+    description: 'Want to keep your answers secure from other people at this' +
+    ' address?',
+    linkText: 'Get a separate access code to submit an individual response',
+    link: '../individual-decision-secure'
+  },
+  'pin-you': {
+    description: 'You\'ve chosen to keep your answers secure',
+    linkText: 'Cancel this and make answers available to the rest of the' +
+    ' household',
+    link: '../individual-decision-secure'
+  },
+  'question-proxy': {
+    description: 'Not happy to continue answering for $[NAME]?',
+    linkText: 'Request an individual access code to be sent to them',
+    link: '../individual-decision-other-secure'
+  }
+};
+
+function updateAllPreviousLinks() {
+  $('.js-previous-link').attr('href', document.referrer);
+}
+
+function updatePersonLink() {
+  const personId = new URLSearchParams(window.location.search).get('person');
+
+  if (personId) {
+    let urlParam = new URLSearchParams(window.location.search),
+      person = getHouseholdMemberByPersonId(personId)['@person'],
+      pinObj = getPinFor(personId),
+      secureLinkTextConfig = secureLinkTextMap[
+        (getAnsweringIndividualByProxy() ? 'question-proxy' : (pinObj && pinObj.pin ? 'pin-you' : 'question-you'))
+      ],
+      linkHref = secureLinkTextConfig.link + '?person=' + personId +
+        '&returnurl=' + window.location.pathname,
+      surveyType = urlParam.get('survey');
+
+    linkHref += (surveyType ? '&survey=' + surveyType : '');
+
+    let $secureLink = $('.js-link-secure');
+    $secureLink.attr('href', linkHref);
+
+    $secureLink.html(secureLinkTextConfig.linkText);
+    $('.js-link-secure-label').html(secureLinkTextConfig.description.replace('$[NAME]', person.fullName));
+
+    let personLink = $('.js-link-person');
+    personLink.attr('href', personLink.attr('href') + '?person=' + personId +
+      (surveyType ? '&survey=' + surveyType : ''));
+  }
+}
+
+function updateBySurveyType() {
+  const urlParams = new URLSearchParams(window.location.search),
+    surveyType = urlParams.get('survey');
+
+  if (surveyType) {
+    $('.js-header-title').html(surveyTypeConfig[surveyType].title);
+    $('#people-living-here').html(surveyTypeConfig[surveyType].householdSectionTitle);
+    $('#people-living-here').attr('href', surveyTypeConfig[surveyType].householdSectionLink);
+    $('#relationships-section').attr('href', surveyTypeConfig[surveyType].relationshipsSection);
+    $('title').html(surveyTypeConfig[surveyType].title);
+  }
+}
+
+function setAnsweringIndividualByProxy(bool) {
+  sessionStorage.setItem(INDIVIDUAL_PROXY_STORAGE_KEY, JSON.stringify(bool));
+}
+
+function getAnsweringIndividualByProxy() {
+  return JSON.parse(sessionStorage.getItem(INDIVIDUAL_PROXY_STORAGE_KEY));
+}
+
+function unsetAnsweringIndividualByProxy() {
+  (getAnsweringIndividualByProxy() !== null) && sessionStorage.removeItem(INDIVIDUAL_PROXY_STORAGE_KEY);
+}
+
+const surveyTypeConfig = {
+  lms: {
+    title: 'Online Household Study',
+    householdSectionTitle: 'About your household',
+    householdSectionLink: '../summary/?survey=lms',
+    relationshipsSection: '../relationships/?survey=lms'
+  }
+};
+
+function doILiveHere() {
+  return sessionStorage.getItem('lives-here') === 'yes';
+}
+
+function getSignificant() {
+  return '3 February 2019';
+}
+
+function updateSignificantDate() {
+  $('.js-significant-date').each((i, el) => cleanHTMLPlaceholderStringReplacment(el, getSignificant()));
+}
+
+function personRecordTemplate() {
+  return $(`<li id="person-record-template" class="list__item">
+        <span class="list__item-name js-person-name"></span>
+        <div class="list__item-actions u-fr">
+            <span class="list__item-action">
+                <a class="js-record-edit" href="#">Change</a>
+                <span class="js-spacer">|</span>
+                <a class="js-record-remove" href="#">Remove</a>
+            </span>
+        </div>
+    </li>`);
+}
+
+function createMemberItem(member, { redirect } = { redirect: null }) {
+  var $nodeEl = personRecordTemplate(),
+    $editLink = $nodeEl.find('.js-record-edit'),
+    $removeLink = $nodeEl.find('.js-record-remove'),
+    $spacer = $nodeEl.find('.js-spacer'),
+    urlParams = new URLSearchParams(window.location.search),
+    personNameText = member['@person'].fullName,
+    memberIsUser = isMemberUser(member),
+    surveyType = urlParams.get('survey'),
+    altPage = surveyType && surveyType === 'lms' ? surveyType + '/' : '',
+    redirectTo = (redirect ? '&redirect=' + encodeURIComponent(window.location.href) : '');
+
+  if (memberIsUser) {
+    personNameText += ' (You)';
+    $editLink.html('Change');
+    $removeLink.hide();
+    $spacer.hide();
+  }
+
+  $nodeEl.attr('id', '');
+  $nodeEl.find('.js-person-name').html(personNameText);
+
+  $editLink.attr('href', (
+    (memberIsUser
+      ? '../' + altPage + 'what-is-your-name/?edit=true'
+      : '../' + altPage + 'who-else-to-add/?edit=' + member['@person'].id +
+        (isVisitor(member) ? '&journey=visitors' : '')) +
+    redirectTo
+  ));
+
+  $removeLink.attr('href', (
+    '../remove-household-member/?person=' + member['@person'].id +
+    redirectTo
+  ));
+
+  return $nodeEl;
+}
+
+function updateHouseholdSummary() {
+  const members = getAllHouseholdMembers();
+
+  $('.js-household-members-summary').each(function(i, el) {
+    const $el = $(el);
+
+    $.each([
+      ...members.filter(isMemberUser),
+      ...members.filter(isOtherHouseholdMember)
+    ], function(i, member) {
+      $el.append(createMemberItem(member, { redirect: $el.attr('data-redirect') }));
+    });
+  });
+}
+
+function updateVisitorsSummary() {
+  const members = getAllHouseholdMembers();
+
+  $('.js-visitors-summary').each(function(i, el) {
+    const $el = $(el);
+
+    $.each(members.filter(isVisitor), (i, member) => {
+      $el.append(createMemberItem(member, { redirect: $el.attr('data-redirect') }));
+    });
+  });
+}
+
+function updateContinueNotice() {
+  const urlParams = new URLSearchParams(window.location.search),
+    isContinuing = urlParams.get('continuing'),
+    personId = urlParams.get('person');
+
+  if (!isContinuing) {
+    return false;
+  }
+
+  const template = `<div class="panel panel--simple panel--info u-mb-s">
+      <div class="panel__body">
+          <strong>This was the last question
+              you answered in the section</strong>
+          <p>You can review your answers
+              at the <a href="../individual-decision/?person=${personId}">start 
+              of this section</a>
+          </p>
+      </div>
+  </div>`;
+
+  $('.js-heading').closest('.question').prepend(template);
+}
+
+function updateSaveAndCompleteLater() {
+  $('.complete-later').on('click', function(e) {
+    e.preventDefault();
+
+    window.location.href = '../index/?redirect=../hub';
+  });
+}
+
+function updateFoortListCol() {
+  $('.js-footer-list-col').append('<li><a href="../test-data"' +
+    ' class="footer__link footer__link--inline ghost-link u-fr">Test' +
+    ' data</a></li>');
+}
+
+function isMemberUser(member) {
+  return member['@person'].id === window.ONS.storage.IDS.USER_HOUSEHOLD_MEMBER_ID;
+}
+
+function sessionBookmark() {
+  var pieces = window.location.href
+    .replace(window.location.pathname, '[delimeter]')
+    .split('[delimeter]');
+
+  pieces.shift();
+
+  if (window.location.pathname.match(/test-data/g)) {
+    console.log('match');
+    return;
+  }
+
+  sessionStorage.setItem('_session_bookmark', [].concat(window.location.pathname, pieces).join(''));
+}
+
+function fieldItemDisplayHack() {
+  $('.field__item').after('<br />');
+}
+
+window.ONS = window.ONS || {};
+window.ONS.storage = {
+  getAddress,
+  addHouseholdMember,
+  updateHouseholdMember,
+  deleteHouseholdMember,
+  getAllHouseholdMembers,
+  addUserPerson,
+  getUserPerson,
+  getUserAsHouseholdMember,
+  getHouseholdMemberByPersonId,
+  getMemberPersonId,
+  updateUserAsHouseholdMember,
+  deleteUserAsHouseholdMember,
+  tempAwayQuestionSentenceMap,
+  visitorQuestionSentenceMap,
+
+  isVisitor,
+  isOtherHouseholdMember,
+  isHouseholdMember,
+
+  addRelationship,
+  deleteRelationship,
+  editRelationship,
+  getAllRelationships,
+  getAllManualRelationships,
+  deleteAllRelationshipsForMember,
+
+  getAllParentsOf,
+  getAllChildrenOf,
+  getParentIdFromRelationship,
+  getChildIdFromRelationship,
+  getOtherPersonIdFromRelationship,
+  isAParentInRelationship,
+  isAChildInRelationship,
+  isInRelationship,
+  areAnyChildrenInRelationshipNotParent,
+  isRelationshipType,
+  isRelationshipInferred,
+  getRelationshipOf,
+
+  relationshipDescriptionMap,
+  relationshipSummaryTemplates,
+  missingRelationshipInference,
+  inferRelationships,
+  getRelationshipsWithPersonIds,
+  getPeopleIdsMissingRelationshipsWithPerson,
+  getRelationshipType,
+  findNextMissingRelationship,
+
+  addUpdatePersonalDetailsDOB,
+  getPersonalDetailsFor,
+  removePersonalDetailsFor,
+  addUpdateMaritalStatus,
+  addUpdateCountry,
+  addUpdateCountryOther,
+  addUpdateNationalIdentity,
+  addUpdateNationalIdentityOther,
+  addUpdateEthnicGroup,
+  addUpdateEthnicGroupDescription,
+  addUpdateEthnicGroupOther,
+  addUpdatePassportCountry,
+  addUpdatePassportCountryOther,
+  addUpdateOrientation,
+  addUpdateSalary,
+  addUpdateSex,
+  addUpdateAddressWhere,
+  addUpdateAddressIndividual,
+  addUpdateAge,
+  addUpdateAgeConfirm,
+  addUpdateAddressOutsideUK,
+  addUpdateApprenticeship,
+  addUpdateHasQualificationAbove,
+  addUpdateQualificationsNvqEquivalent,
+  addUpdateQualificationsALevel,
+  addUpdateQualificationsGCSEs,
+  addUpdateQualificationsOtherWhere,
+  addUpdateEmploymentStatus,
+  addUpdateJobTitle,
+  addUpdateJobDescribe,
+
+  personalDetailsMaritalStatusMap,
+  personalDetailsCountryMap,
+  personalDetailsOrientationMap,
+  personalDetailsGenderMap,
+  personalDetailsNationalIdentityMap,
+  personalDetailsEthnicGroupMap,
+  personalDetailsPassportCountriesMap,
+  personalDetailsApprenticeshipMap,
+  personalDetailsDegreeAboveMap,
+  personalDetailsNVQMap,
+  personalDetailsALevelMap,
+  personalDetailsGCSEMap,
+  personalDetailsOtherWhere,
+  personalDetailsEmploymentStatus,
+
+  createPinFor,
+  getPinFor,
+  unsetPinFor,
+  personalBookmark,
+  getBookmarkFor,
+  clearPersonalBookmark,
+  personalQuestionSubmitDecorator,
+
+  setAnsweringIndividualByProxy,
+  getAnsweringIndividualByProxy,
+  unsetAnsweringIndividualByProxy,
+
+  doILiveHere,
+  isMemberUser,
+
+  KEYS: {
+    HOUSEHOLD_MEMBERS_STORAGE_KEY,
+    USER_STORAGE_KEY,
+    INDIVIDUAL_PROXY_STORAGE_KEY,
+    HOUSEHOLD_MEMBER_TYPE,
+    VISITOR_TYPE,
+    RELATIONSHIPS_STORAGE_KEY,
+    PERSONAL_DETAILS_KEY
+  },
+
+  IDS: {
+    USER_HOUSEHOLD_MEMBER_ID
+  },
+
+  TYPES: {
+    person,
+    relationship
+  }
+};
+
+window.ONS.helpers = {
+  populateHouseholdList,
+  populateVisitorList
+};
+
+window.ONS.utils = {
+  removeFromList,
+  trailingNameS,
+  numberToPositionWord,
+  numberToWordsStyleguide,
+  getSignificant,
+  cleanHTMLPlaceholderStringReplacment
+};
+
+$(populateHouseholdList);
+$(populateVisitorList);
+$(updateHouseholdVisitorsNavigationItems);
+$(updateAddresses);
+$(updatePersonLink);
+$(tools);
+$(updateAllPreviousLinks);
+$(updateBySurveyType);
+$(updateSignificantDate);
+$(updateHouseholdSummary);
+$(updateVisitorsSummary);
+$(updateContinueNotice);
+$(updateSaveAndCompleteLater);
+$(updateFoortListCol);
+$(sessionBookmark);
+$(fieldItemDisplayHack);
diff --git a/_prototypes/your-household-v13/complete.html b/_prototypes/your-household-v13/complete.html
new file mode 100644
index 0000000000..1d8a1aed85
--- /dev/null
+++ b/_prototypes/your-household-v13/complete.html
@@ -0,0 +1,39 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+hideSaveLater: true
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <h1 class="question__title u-fs-l">
+                    You have successfully completed the Census
+                </h1>
+
+                <div class="panel panel--simple panel--success">
+                    <div class="panel__body">
+                        <strong>Your reference number</strong>
+                        <p class="u-fs-l">HDJ2123F</p>
+                    </div>
+                </div>
+
+                <p class="u-mt-m">It is now safe to close this window.</p>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
diff --git a/_prototypes/your-household-v13/confirm-address.html b/_prototypes/your-household-v13/confirm-address.html
new file mode 100644
index 0000000000..bec667902d
--- /dev/null
+++ b/_prototypes/your-household-v13/confirm-address.html
@@ -0,0 +1,99 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../index">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form u-mb-xl"
+                      role="form" autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 class="question__title u-fs-l">
+                                        Can you confirm this address is correct?
+                                    </h1>
+                                </div>
+
+                                <p for="address-correct-yes"><span
+                                        class="full-address-text">Address not
+                                    set</span></p>
+
+                                <div class="answer__fields js-fields">
+                                    <div class="field field--radio field--multiplechoice ">
+                                        <fieldset>
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable" type="radio"
+                                                       name="address-correct" id="address-correct-yes">
+                                                <label class="label label--inline" for="address-correct-yes">Yes, this
+                                                    address is correct</label>
+                                            </div>
+
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable" type="radio"
+                                                       name="address-correct" id="address-correct-no">
+                                                <label class="label label--inline venus" for="address-correct-no">No, I need to change this</label>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                </form>
+            </main>
+        </div>
+    </div>
+
+    <button class="qa-btn-submit btn btn-submit btn--primary btn--lg" data-qa="btn-submit" type="submit"
+            name="action[save_continue]">Save and continue
+    </button>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+	var yesbox = document.getElementById("address-correct-yes");
+
+	$('.qa-btn-submit').on('click', function (e) {
+
+		var loc = yesbox.checked ? "../section-intro" :
+          "../test-address/?edit=true";
+
+        document.trav.action = loc;
+        window.location = loc;
+	});
+</script>
+
+<script>
+	$(function () {
+	  if(sessionStorage.getItem('address')) {
+		$('.full-address-text').html((sessionStorage.getItem('address') || '').replace(/,/g, '<br />'));
+      }
+	});
+</script>
+
+<script>
+	$(function () {
+		var oneWeekAgo = new Date();
+		oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+		var options = {year: 'numeric', month: 'long', day: 'numeric'};
+		$('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
+	});
+</script>
+
diff --git a/_prototypes/your-household-v13/do-you-live-here.html b/_prototypes/your-household-v13/do-you-live-here.html
new file mode 100644
index 0000000000..14467ddb21
--- /dev/null
+++ b/_prototypes/your-household-v13/do-you-live-here.html
@@ -0,0 +1,153 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../what-is-your-name">Previous
+        </a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question">
+                                    <h1 class="question__title u-fs-l">
+                                        Do you usually live at <span
+                                            class="address-text"></span>?
+                                    </h1>
+
+                                    <div
+                                            class="collapsible collapsible--simple js-collapsible js-collapsible-simple u-mb-s">
+                                        <div class="js-collapsible-content">
+                                            <h3
+                                                    class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs-r--b" data-ga="click" data-ga-category="definition" data-ga-action="Open panel" data-ga-label="What does 'usually live' mean?">What does 'usually live' mean?</h3>
+                                            <div class="collapsible__body js-collapsible-body">
+                                                <p>The address at which you
+                                                    generally spend most
+                                                    time. For most people,
+                                                    this will be their
+                                                    permanent or family home.</p>
+                                                <p><strong>Full-time
+                                                    students</strong>, include
+                                                    yourself at your term
+                                                    time address.</p>
+                                                <p><strong>Armed
+                                                    forces members</strong>,
+                                                    include yourself at your
+                                                    home address if you have
+                                                    one.</p>
+                                                <button
+                                                        class="btn btn--secondary btn--small js-collapsible-close u-no-js-hide" data-ga="click" data-ga-category="definition" data-ga-action="Close panel" data-ga-label="What does 'usually live' mean?">Hide this</button>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="live-here"
+                                                           id="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes">
+                                                        Yes, I usually live here
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="live-here"
+                                                           id="no">
+                                                    <label class="label label--inline"
+                                                           for="no">
+                                                        No, I don&rsquo;t
+                                                        usually live
+                                                        here
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<style>
+    .label .label--negative {
+        margin-left: -1.9rem;
+    }
+</style>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes");
+  $('.qa-btn-submit').click(function(e) {
+    e.preventDefault();
+
+    var loc;
+
+    if (yesbox.checked) {
+      /*var personUser = window.ONS.storage.getUserPerson();
+
+      /!**
+       * Add member to household
+       *!/
+      window.ONS.storage.updateUserAsHouseholdMember(
+        personUser,
+        {
+          type: window.ONS.storage.KEYS.HOUSEHOLD_MEMBER_TYPE
+        }
+      );*/
+
+      sessionStorage.setItem('lives-here', 'yes');
+      document.trav.action = loc = "../what-is-your-name/";
+
+    } else {
+      window.ONS.storage.deleteUserAsHouseholdMember();
+
+      sessionStorage.setItem('lives-here', 'no');
+      document.trav.action = loc = "../i-dont-live-here";
+    }
+
+    window.location = loc;
+  });
+
+  $(function() {
+    var oneWeekAgo = new Date();
+    oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+    var options = {year: 'numeric', month: 'long', day: 'numeric'};
+    $('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
+  });
+</script>
+
diff --git a/_prototypes/your-household-v13/does-anyone-else-live-here.html b/_prototypes/your-household-v13/does-anyone-else-live-here.html
new file mode 100644
index 0000000000..b642b83456
--- /dev/null
+++ b/_prototypes/your-household-v13/does-anyone-else-live-here.html
@@ -0,0 +1,189 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<style>
+    .list--records {
+        margin-right : .5rem;
+    }
+</style>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="previous"
+                           value="does-anyone-else-live-here"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l">
+                                        Does anyone else live at <span
+                                            class="address-text"></span>?
+                                    </h1>
+                                </div>
+
+                                <ul style="display:none;"
+                                    class="list list--records list--people u-mb-s js-household-members-summary"
+                                    data-redirect="../does-anyone-else-live-here/"></ul>
+                                <ul style="display:none;"
+                                    class="list list--records list--people u-mb-s js-visitors-summary"
+                                    data-redirect="../does-anyone-else-live-here/"></ul>
+
+                                <div class="panel panel--simple panel--info u-mb-m js-visitor-panel" style="display: none">
+                                    <div class="panel__body">
+                                        <strong class="u-mb-xs u-d-b">Include</strong>
+                                        <ul class="js-visitor-includes"></ul>
+                                    </div>
+                                </div>
+
+                                <div class="answer__fields js-fields">
+                                    <div class="field field--radio field--multiplechoice ">
+                                        <fieldset class="u-mb-xl">
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="does-anyone-else-live-here"
+                                                       id="yes-someone-else"
+                                                       value="yes">
+                                                <label class="label label--inline venus"
+                                                       for="yes-someone-else"
+                                                       id="yes-someone-else-label">
+                                                    <strong
+                                                            class="yes-answer u-fs-r">
+                                                        Yes, I need to
+                                                        add another
+                                                        person</strong>
+                                                    <p
+                                                            class="u-fs-s u-db u-mb-no label--negative js-householdmembers-detail">Include partners,
+                                                        children, babies born on or before <span class="js-significant-date"></span>, housemates, tenants and lodgers, students and schoolchildren who live away from home during term time, where this is their permanent or family home</p>
+                                                </label>
+                                            </div>
+
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="does-anyone-else-live-here"
+                                                       id="no" value="no">
+                                                <label class="label label--inline"
+                                                       for="no">No, I do not need to add anyone</label>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes-someone-else"),
+    storageAPI = window.ONS.storage;
+  $('.qa-btn-submit').click(function(e) {
+
+    /**
+     * Routing
+     */
+    if (!yesbox.checked) {
+      if (window.location.search.match(/journey=visitors/)) {
+        document.trav.action = "../summary";
+      }
+      else {
+        document.trav.action = "../temp-types-living-away";
+      }
+
+    } else {
+      document.trav.action = "../who-else-to-add";
+    }
+  });
+
+  $(function() {
+    var addressLines = (sessionStorage.getItem('address') || '').split(','),
+      addressLine1 = addressLines[0],
+      addressLine2 = addressLines[1],
+      members = storageAPI.getAllHouseholdMembers(),
+      householdMembers = members.filter(storageAPI.isHouseholdMember),
+      visitors = members.filter(storageAPI.isVisitor),
+      nextPosition,
+      visitorTypesStr =
+        new URLSearchParams(window.location.search).get('visitor-types'),
+      isVisitorJourney = window.location.search.match(/journey=visitors/);
+
+    if (isVisitorJourney) {
+      nextPosition = visitors.length + 1;
+      $('#form').prepend("<input type='hidden' name='visitor-types' value='" + visitorTypesStr + "' />");
+      $('#form')
+        .prepend('<input type="hidden" name="journey" value="visitors" />');
+      $('#question-title')
+        .html('Are there any other visitors staying overnight on ' +
+          window.ONS.utils.getSignificant()
+          + ' at ' +
+          addressLine1 +
+          ', ' + addressLine2 + '?');
+
+      $('.js-visitors-summary').show();
+
+      if (visitorTypesStr) {
+        var visitorTypes = JSON.parse(visitorTypesStr);
+
+        if (visitorTypes.length) {
+          document.querySelector('.js-visitor-panel').style.display = 'block';
+
+          var visitorIncludes = document.querySelector('.js-visitor-includes');
+
+          visitorTypes.forEach(function (type) {
+            var li = document.createElement('li');
+            li.className = 'list__item';
+
+            li.innerHTML = storageAPI.visitorQuestionSentenceMap[type];
+
+            visitorIncludes.appendChild(li);
+          });
+        }
+      }
+
+      $('.js-householdmembers-detail').hide();
+    }
+    else {
+      nextPosition = householdMembers.length + 1;
+      $('.js-household-members-summary').show();
+    }
+
+    if ((nextPosition) > 1) {
+      $('.yes-answer').html(
+        'Yes, I need to add a ' +
+        window.ONS.utils.numberToPositionWord(nextPosition) +
+        ' ' + (isVisitorJourney ? 'visitor' : 'person')
+      );
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/hub.html b/_prototypes/your-household-v13/hub.html
new file mode 100644
index 0000000000..c2aae083d7
--- /dev/null
+++ b/_prototypes/your-household-v13/hub.html
@@ -0,0 +1,438 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+</div>
+
+<style>
+    .completed {
+        position: relative;
+    }
+
+    .completed::before {
+        z-index:2;
+        content:"";
+        background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAbCAYAAAAZMl2nAAAABGdBTUEAALGPC/xhBQAAAjtJREFUSA29l0FLW0EQx2f2NWDSQ196sFBELKFfwVMPNcmLFZV68eRFPBd6K4IexKT0IHjpqdDi0aMg5iCKUvDkqdBDQYiKIIJY0oO1wZhMd0L3+V6yz+TlrZ1DNjOzM/9f9u1uEoD/aH3Lk/EgORGUMB1/VHDeXf4u7z9ZyvXqeqMuaDqWLGTf1Ov0sdEX8UdMWJmLuc0zr869g9iL2RlC+gwEHi08eCB60j/nN04VjCepQuZGe9GZJqAvANS6BRBKIobp8uz2CSu2TjDEcScEaxCk6Jq+2h9eDbB7LyBtIVhZGgEMQLVaXKAFYfzRdArBIFL8EgWOlOe394yCdAvBUBa/NNvTT+MJa7B/rSf7/KyyUzpuzuv8KBDcr2WPMMTV+Z+i3O2jUKtt2O+Hh3TC3lhUCO7lezQuBNFLJYSAV2BZY7/mNndVzDuagOB+7oroIHiCXJkE1G+Kj/NOjn2vmYLgng2QIAglSgTxGtB6spAbVzGTENwTiQiTeWdLfvKMEgkcEaqAYgrr8DDwxmwq9h7RppTPFYhIKGgFEGu+jM4hiAHRqmkIlmoc38rO0fdE5llJfi+9ljF33+hY/uV9m1w3r9OVULXuPRISRtVrx7AQ3MQFYccETDcQLSBRYbqF0IJ0CxMFIhAkLExUiDtBOoUxAdEWxAdDOCF9qXtrpiC4o+/U3Er43/Fpig+lTuQ9zPdMA8YkBKt1BMITK7uH3xLp1Ln8eTdqGoL7hzY777yV/1NehC5sU/AXb484yamkz/AAAAAASUVORK5CYII=") no-repeat 50%;
+        background-size:1rem;
+        position:absolute;
+        left:9px;left:-1.5rem;
+        width:1.2em;
+        height:1.2em;
+        bottom:0;
+        top:0;
+        margin:auto;
+    }
+
+    .btn--primary[disabled] {
+        opacity: .5;
+    }
+</style>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-3@l"></div>
+        <div class="grid__col col-8@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate=""
+                      action="../complete">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1
+                                            class="question__title u-fs-l js-heading">
+                                        Remaining sections to complete
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info js-panel-info"
+                                     id="question-guidance-everyone-at-address-confirmation-question">
+                                    <strong class="u-mb-s">You must complete all sections in order to submit this survey</strong>
+                                </div>
+                                <br />
+
+                                <div class="summary u-mb-xl">
+                                    <div class="summary__block">
+                                        <div class="summary__item">
+                                            <div class="grid">
+                                                <div
+                                                        class="grid__col col-12@xs col-5@s">
+                                                    <div
+                                                            class="summary__question completed">
+                                                        <strong>
+                                                            People who live
+                                                            here
+                                                        </strong>
+                                                        <span
+                                                                class="u-d-no@s">&mdash; Completed</span>
+                                                    </div>
+                                                </div>
+                                                <div
+                                                        class="grid__col col-3@xs col-3@s">
+                                                    <div
+                                                            class="summary__answer u-d-no u-d-b@s">Completed</div>
+                                                </div>
+                                                <div
+                                                        class="grid__col col-12@xs col-4@s">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                href="../summary/?show-panel=true" class="js-view-summary u-fr@m">
+                                                            View answers
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div id="household-member-surveys"></div>
+                                        <div id="visitor-surveys"></div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <div class="submit-notice">
+                        <button class="btn btn--primary btn--lg js-submit-btn"
+                                type="submit">Continue
+                        </button>
+                    </div>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<ul style="display:none;">
+    <div id="person-survey-item-template" class="summary__item">
+        <div class="grid">
+            <div class="grid__col col-12@xs col-5@s">
+                <div class="summary__question js-survey-question">
+                    <strong class="js-person-name"></strong>
+                    <span class="u-d-no@s">&mdash;
+                        <span class="js-survey-status">Not started</span></span>
+                </div>
+            </div>
+            <div class="grid__col col-8@xs col-3@s">
+                <div class="summary__answer js-survey-status u-d-no u-d-b@s">Not started</div>
+            </div>
+            <div class="grid__col col-12@xs col-4@s">
+                <div class="summary__link">
+                    <a href="#" class="js-link"></a>
+                </div>
+            </div>
+        </div>
+    </div>
+</ul>
+
+<style>
+    @media only screen and (max-width:740px) {
+        .summary__link {
+            text-align: left;
+            justify-content: flex-start;
+        }
+    }
+
+    .completed::before {
+        width : 1rem;
+        height : 1rem;
+        background: url('https://sdc-global-design-patterns.netlify.com/assets/img/icons/icons--check-green.svg') no-repeat 50%;
+    }
+
+    .summary__question.completed {
+        padding-left : 1.5rem;
+    }
+
+    .summary__question.completed::before {
+        left : 0;
+    }
+
+    /*https://sdc-global-design-patterns.netlify.com/assets/img/icons/icons--check-green.svg*/
+</style>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    surveyType = urlParams.get('survey');
+  
+  var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+  var relationships = JSON.parse(sessionStorage.getItem('relationships') || '[]');
+
+  var statusMap = {
+    'not-started': {
+      label: 'Not started',
+      linkText: 'Start section',
+    },
+    'in-progress': {
+      label: 'Paritally complete',
+      linkText: 'Continue with section'
+    },
+    'completed': {
+      label: 'Completed',
+      linkText: 'View answers'
+    },
+    'private': {
+      label: 'Responding individually',
+      linkText: null
+    },
+    'seperate-survey-requested': {
+      label: 'Seperate survey requested',
+      linkText: 'Change'
+    }
+  };
+
+  var allHouseholdMembers = storageAPI.getAllHouseholdMembers(),
+
+    people = allHouseholdMembers.filter(storageAPI.isHouseholdMember),
+    visitors = allHouseholdMembers.filter(storageAPI.isVisitor),
+
+    peopleIds = _.flatten([
+      _.pluck(people.map(function (member) { return member['@person']; }), 'id'),
+      _.pluck(visitors.map(function (member) { return member['@person']; }), 'id')
+    ]),
+
+    peopleIdsToComplete = [].concat(peopleIds);
+
+  var nextPageSurvey = surveyType ? '&survey=' + surveyType : '';
+
+  function isHouseholdMemberSectionComplete(personDetails) {
+    return personDetails &&
+      !(!!personDetails._bookmark && !!personDetails._bookmark.page);
+  }
+
+  function isVisitorSectionComplete(personDetails) {
+
+    if(!personDetails.sex) {
+      return false;
+    }
+
+    if(!personDetails['address-where']) {
+      return false;
+    }
+
+    if(personDetails['address-where'] === 'in-uk' &&
+      !personDetails.address
+    ) {
+      return false;
+    }
+
+    if(personDetails['address-where'] === 'outside-uk' &&
+      !personDetails['address-outside-uk']
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Get state
+   */
+  function getSurveyStatus(personDetails, personPin, isVisitor, personId) {
+    var status;
+
+    if (personPin && personPin.exported) {
+      status = 'private';
+    }
+    else if(
+      personId &&
+      cannotAnswerPeople.find(function(person) { return person.id === personId}) &&
+      cannotAnswerPeople.find(function(person) { return person.id === personId}).responseOption === 'new-survey' &&
+      relationships.find(function(person) { return person.personIsId === personId && person.personToId === 'person_me' }).personIsDescription === 'unrelated'
+    ) {
+      status = 'seperate-survey-requested';
+    }
+    else if (!personDetails) {
+      status = 'not-started';
+    }
+    else if (
+      !isVisitor
+        ? isHouseholdMemberSectionComplete(personDetails)
+        : isVisitorSectionComplete(personDetails)
+    ) {
+      status = 'completed';
+    }
+    else {
+      status = 'in-progress';
+    }
+
+    return status;
+  }
+
+  /**
+   * Link routing
+   */
+  function getLinkHrefHouseholdMember(person, status/*, personPin*/) {
+    return status === 'in-progress'
+      ? storageAPI.getBookmarkFor(person.id) + '&continuing=true'
+      : (status === 'completed'
+        ? '../individual-details-summary/' : '../individual-intro/'
+      ) + '?person=' + person.id;
+
+    //+ '?person=' + person.id
+
+    /*if (personPin && personPin.pin) {
+      linkHref = '../individual-pin-security/?returnurl=' + linkHref +
+        '&person=' + person.id;
+    }
+    else {
+      linkHref += '?person=' + person.id;
+    }*/
+
+    //return linkHref;
+  }
+
+  function getLinkHrefVisitor(person, status) {
+    var linkHref = status === 'completed'
+      ? '../individual-details-summary/'
+      : '../individual-details-sex/';
+
+    linkHref += '?person=' + person.id;
+
+    return linkHref;
+  }
+
+  /**
+   * Create list item from state
+   */
+  function createListItem(person, surveyStatus, linkHref, isVisitor) {
+    var $nodeEl = $('#person-survey-item-template').clone(),
+      $surveyStatus = $nodeEl.find('.js-survey-status'),
+      $surveyQuestion = $nodeEl.find('.js-survey-question');
+
+    /**
+     * Manipulate DOM fragment
+     */
+    $nodeEl.attr('id', '');
+    $nodeEl.find('.js-person-name').html(
+      person.fullName +
+        (person.id === storageAPI.IDS.USER_HOUSEHOLD_MEMBER_ID ? ' (you)': '') +
+        (isVisitor ? ' (Visitor)': '')
+    );
+
+    $nodeEl.find('.js-link').html(statusMap[surveyStatus].linkText);
+    $surveyStatus.html(statusMap[surveyStatus].label);
+
+    surveyStatus === 'private'
+      ? $nodeEl.find('.js-link').hide()
+      : $nodeEl.find('.js-link').attr('href', linkHref);
+
+    (surveyStatus === 'completed' || surveyStatus === 'private')
+    && $surveyQuestion.addClass('completed');
+
+    if(surveyStatus === 'not-started') {
+      $nodeEl.find('.js-link').on('click', function () {
+        storageAPI.unsetAnsweringIndividualByProxy();
+      });
+    }
+
+    if (surveyStatus === 'seperate-survey-requested') {
+      $nodeEl.find('.js-link').attr('href', '../uac-question?person_id=' + person.id);
+    }
+
+    return $nodeEl;
+  }
+
+  function createList(data) {
+    var $container = $('<div></div>');
+
+    var mappedList = data.map(function (member, index) {
+      var person = member['@person'];
+      var isVisitor = storageAPI.isVisitor(member);
+
+      var personDetails = storageAPI.getPersonalDetailsFor(person.id),
+        personPin = storageAPI.getPinFor(person.id);
+
+      var surveyStatus = getSurveyStatus(personDetails, personPin, isVisitor, person.id);
+      var linkHref = !isVisitor
+        ? getLinkHrefHouseholdMember(person, surveyStatus, personPin)
+        : getLinkHrefVisitor(person, surveyStatus);
+
+      if(surveyStatus === 'completed') {
+        window.ONS.utils.removeFromList(peopleIdsToComplete, person.id);
+      }
+
+      linkHref += nextPageSurvey;
+
+      return {
+        person: person,
+        surveyStatus: surveyStatus,
+        linkHref: linkHref,
+        isVisitor: isVisitor
+      }
+    });
+
+
+    mappedList.forEach(function(item) {
+      $container.append(createListItem(item.person, item.surveyStatus, item.linkHref, item.isVisitor));
+    });
+
+    return $container;
+  }
+
+  function updatePageState() {
+    $('#household-member-surveys').append(createList(people));
+    $('#visitor-surveys').append(createList(visitors));
+
+    if (peopleIdsToComplete.length === 0) {
+      $('.js-submit-btn').html('Submit survey');
+      $('.js-heading').html('Submit survey');
+      $('.js-panel-info').html('Please submit this survey to complete it');
+    }
+    else {
+      $('.js-submit-btn').on('click', function (e) {
+        e.preventDefault();
+
+        var nextStartPersonId;
+
+        /**
+         * Attempt to find next bookmark
+         */
+        var nextBookmarkPersonId = _.find(peopleIds, function (personId) {
+          var personalDetails = storageAPI.getPersonalDetailsFor(personId);
+
+          return personalDetails && personalDetails['_bookmark'];
+        });
+
+        /**
+         * If no bookmark is found, attempt to find next section to start
+         */
+        if (!nextBookmarkPersonId) {
+          nextStartPersonId = _.find(allHouseholdMembers, function(member) {
+            var person = member['@person'];
+            var personDetails = storageAPI.getPersonalDetailsFor(person.id);
+            var status = getSurveyStatus(personDetails, null, storageAPI.isVisitor(member), person.id);
+
+            return status === 'not-started';
+
+          })['@person'].id;
+        }
+
+        if (nextBookmarkPersonId) {
+          storageAPI.setAnsweringIndividualByProxy(true);
+        }
+
+        window.location.href = nextBookmarkPersonId
+          ? storageAPI.getBookmarkFor(nextBookmarkPersonId) + '&continuing=true'
+          : '../individual-intro/?person=' + nextStartPersonId;
+      });
+    }
+  }
+
+  function updateLinks () {
+    if (surveyType) {
+      $('.js-view-summary').attr('href', '../summary/?survey=' + surveyType);
+    }
+  }
+
+  $(updatePageState);
+  $(updateLinks);
+</script>
diff --git a/_prototypes/your-household-v13/i-dont-live-here.html b/_prototypes/your-household-v13/i-dont-live-here.html
new file mode 100644
index 0000000000..28b194f27b
--- /dev/null
+++ b/_prototypes/your-household-v13/i-dont-live-here.html
@@ -0,0 +1,117 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../what-is-your-name">Previous
+        </a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question">
+                                    <h1 class="question__title u-fs-l">
+                                        Does anyone usually live at <span
+                                            class="address-text"></span>?
+                                    </h1>
+
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="live-here"
+                                                           id="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes">
+                                                        <strong class="u-fs-r">Yes, I
+                                                            need to
+                                                        add someone</strong>
+                                                        <p
+                                                                class="u-fs-s u-db u-mb-no">Include partners, children, babies born on or before <span class="js-significant-date"></span>, housemates, tenants and lodgers, students and schoolchildren who live away from home during term time, where this is their permanent or family home</p>
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="live-here"
+                                                           id="no">
+                                                    <label class="label label--inline"
+                                                           for="no">
+                                                        <strong class="u-fs-r">No, no one usually lives
+                                                            here</strong>
+                                                        <p
+                                                                class="u-fs-s u-db u-mb-no">For example, this is a second address or holiday home</p>
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<style>
+    .label .label--negative {
+        margin-left: -1.9rem;
+    }
+</style>
+
+<script src='/js/compiled/standard-bundle.js'></script>
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes");
+  $('.qa-btn-submit').click(function(e) {
+    e.preventDefault();
+
+    var loc;
+
+    if (yesbox.checked) {
+      document.trav.action = loc = "../who-else-to-add/?previous=i-dont-live-here";
+    } else {
+      sessionStorage.removeItem('household-members');
+      document.trav.action = loc = "../temp-types-living-away";
+    }
+
+    window.location = loc;
+  });
+
+  $(function() {
+    var oneWeekAgo = new Date();
+    oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+    var options = {year: 'numeric', month: 'long', day: 'numeric'};
+    $('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
+  });
+</script>
+
diff --git a/_prototypes/your-household-v13/index.html b/_prototypes/your-household-v13/index.html
new file mode 100644
index 0000000000..19b70ba6af
--- /dev/null
+++ b/_prototypes/your-household-v13/index.html
@@ -0,0 +1,117 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<style>
+    .input--text-lg {
+        width : 100%;
+    }
+
+    .lock {
+        font-weight : normal;
+    }
+</style>
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="feedback__inline js-feedback-inline is-collapsed">
+                    <div class="feedback__border">
+                        <form id="feedback-form" method="POST"
+                              class="feedback__form">
+                            <div class="group">
+                                <div class="feedback__field">
+
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="group u-mb-xl" id="what-is-your-address-group">
+                    <div class="block" id="what-is-your-address">
+                        <div class="question">
+                            <h1 class="question__title u-fs-l"
+                                data-qa="question-title">
+                                Welcome to the household prototype
+                            </h1>
+
+                            <div class="panel panel--simple panel--info">
+                                <div class="panel__body">
+                                    <div class="field">
+                                        <label class="label"
+                                               for="line-1"
+                                               id="label-address-line-1">
+                                            <div class="label__inner">
+                                                Enter the unique access code
+                                            </div>
+                                        </label>
+
+                                        <div class="grid">
+                                            <div class="grid__col col-4@m">
+                                                <input  id="line-1"
+                                                        class="input input--text input--block u-mb-s"
+                                                        data-qa="input-text"
+                                                        value=""/>
+                                            </div>
+                                            <div class="grid__col col-4@m">
+                                                <input
+                                                        class="input input--text input--block u-mb-s"
+                                                        data-qa="input-text"
+                                                        value=""/>
+                                            </div>
+                                            <div class="grid__col col-4@m">
+                                                <input
+                                                        class="input input--text input--block u-mb-s"
+                                                        data-qa="input-text"
+                                                        value=""/>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <p>The unique access code
+                                        is printed on your invitation
+                                        letter or form</p>
+                                </div>
+                            </div>
+
+                            <p class="u-fs-r u-mt-l lock">Your personal information is protected by law and will be kept confidential</p>
+
+                        </div>
+                    </div>
+                </div>
+
+                <button class="btn btn-submit btn--primary btn--lg"
+                        data-qa="btn-submit" type="submit"
+                        name="action[save_continue]">Submit code
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  $('.btn-submit').click(function(e) {
+    e.preventDefault();
+
+    var urlParams = new URLSearchParams(window.location.search),
+      redirect = urlParams.get('redirect');
+
+    window.location = !redirect ? '../confirm-address/' : redirect;
+  });
+</script>
+
diff --git a/_prototypes/your-household-v13/individual-decision-answer-behalf.html b/_prototypes/your-household-v13/individual-decision-answer-behalf.html
new file mode 100644
index 0000000000..25d3c59885
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-answer-behalf.html
@@ -0,0 +1,198 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../hub">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        You have now completed your individual questions. Is there anyone in your household you cannot answer the questions for?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <p>Select all that apply</p>
+
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--checkbox field--multiplechoice field--exclusive">
+                                            <fieldset id="js-member-list"
+                                                      class="u-mb-xl">
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <!--<p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>-->
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-exclusive-group js-person-control"
+               name="checkbox-answer"
+               type="checkbox" />
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    switchedFromUnemployed = urlParams.get(switchedFromUnemployed),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey'),
+
+    personsLeft = storageAPI.getAllHouseholdMembers()
+      .filter(function (member) {
+        return storageAPI.isHouseholdMember && member['@person'].id !== personId;
+      })
+      .map(function (member) { return member['@person'] });
+
+  var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+
+  $('.qa-btn-submit').on('click', function (e) {
+    e.preventDefault();
+
+    var canAnswer = document.querySelector('.js-exclusive-checkbox').checked;
+
+    if (canAnswer) {
+      window.location.href = '../hub';
+    } else {
+      var peopleIds = Array.from(document.querySelectorAll('.js-cloned')).map(function(input) {
+        return input.value;
+      });
+
+      var people = cannotAnswerPeople.filter(function(person) {
+        return peopleIds.includes(person.id);
+      });
+
+      var newPeopleIds = peopleIds.filter(function(id) {
+        return !people.find(function(person) {
+          return person.id === id;
+        });
+      });
+
+      newPeopleIds.forEach(function(id) {
+        people.push({
+          id: id,
+          responseOption: null,
+          phoneNumber: null,
+        });
+      });
+
+      sessionStorage.setItem('cannot-answer-people', JSON.stringify(people));
+
+      window.location.href = '../uac-question';
+    }
+  });
+
+  function createMemberListItem(person) {
+    var $nodeEl = $('#member-checkbox-select-template').clone(),
+      personId = person.id;
+
+    $nodeEl.attr('id', '');
+    $nodeEl.find('.js-person-name').html(person.fullName);
+    $nodeEl.find('.js-person-name').attr('for', personId);
+    $nodeEl.find('.js-person-control').attr('id', personId);
+    $nodeEl.find('.js-person-control').attr('value', personId);
+    $nodeEl.find('.js-person-control').addClass('js-cloned');
+
+    return $nodeEl;
+  }
+
+  function updateAnswer() {
+    $.each(personsLeft, function (i, person) {
+      $('#js-member-list').append(createMemberListItem(person));
+    });
+
+    $('#js-member-list').append('<div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>');
+    $('#js-member-list').append(
+      '<div class="field__item">\n' +
+      '<input class="input input--checkbox js-exclusive-checkbox" name="heating-type" value="no central heating" id="none" type="checkbox">\n' +
+      '<label class="label label--inline u-fs-r " for="none">\n' +
+      '<span class="u-vh">,</span> I can answer for everyone<span class="u-vh">. Selecting this will uncheck all other checkboxes</span>\n' +
+      '</label>\n' +
+      '<span class="js-exclusive-alert u-vh" role="alert" aria-live="polite" data-adjective="deselected"></span>\n' +
+      '</div>'
+    );
+
+    cannotAnswerPeople.forEach(function(person) {
+      document.querySelector('input[value=' + person.id + ']').checked = true;
+    });
+  }
+
+  /*function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }*/
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('You have completed your ' +
+        person.fullName + window.ONS.utils.trailingNameS(person.fullName) +
+        'individual questions. Can you answer the same questions for others ' +
+        'in your household?');
+    }
+  }
+
+  $(updateAnswer);
+  $(updateQuestion);
+  //$(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-behalf-continue.html b/_prototypes/your-household-v13/individual-decision-behalf-continue.html
new file mode 100644
index 0000000000..c1a7add696
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-behalf-continue.html
@@ -0,0 +1,154 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../hub">
+                    <div class="group u-mb-l">
+                        <section class="section">
+                            <div class="question u-mb-s">
+                                <h1 id="question-title"
+                                    class="question__title u-fs-l js-heading">
+                                    Completing the individual questions
+                                </h1>
+                                <p>If you cannot answer individual questions
+                                    for others, you can ask them for their
+                                    informtion and complete their questions
+                                    later. If you want them to complete
+                                    their own questions, they will need the
+                                    unique access code from the Census
+                                    letter we sent you.</p>
+
+                                <p>Alternatively, you can request a separate
+                                    survey for them. We will send them a new
+                                    access code by text.</p>
+                            </div>
+
+                            <div class="field field--radio field--multiplechoice">
+                                <fieldset>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="able"
+                                               id="able"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r"
+                                               for="able">
+                                            I will complete their
+                                            questions now</label>
+                                    </div>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="later"
+                                               id="later"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r "
+                                               for="later">
+                                            I will complete their
+                                            questions later</label>
+                                    </div>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="own"
+                                               id="own"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r "
+                                               for="own">
+                                            I will ask them to complete
+                                            their own questions</label>
+                                    </div>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="invite"
+                                               id="invite"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r "
+                                               for="invite">
+                                            I would like to request a
+                                            separate survey for them to
+                                            complete
+                                            <span class="u-fs-s u-db u-mb-no">You
+                                                will need their mobile number for this
+                                            </span>
+                                        </label>
+                                    </div>
+                                </fieldset>
+                            </div>
+                        </section>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <!--<p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>-->
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-person-control"
+               name="checkbox-answer" type="checkbox">
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    switchedFromUnemployed = urlParams.get(switchedFromUnemployed),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click', function (e) {
+    e.preventDefault();
+
+    window.location.href = $('[name=radio-answer]:checked').val() === 'invite'
+      ? '../individual-decision-enter-mobile/?person=' + personId +
+        '&remaining=' + encodeURI(urlParams.get('people'))
+      : '../hub/';
+  });
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-enter-mobile-correct.html b/_prototypes/your-household-v13/individual-decision-enter-mobile-correct.html
new file mode 100644
index 0000000000..1df7a367a0
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-enter-mobile-correct.html
@@ -0,0 +1,122 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../hub">
+                    <div class="group u-mb-l">
+                        <section class="section">
+                            <div class="question u-mb-s">
+                                <h1 id="question-title"
+                                    class="question__title u-fs-l js-heading">
+                                    Is this mobile number correct?
+                                </h1>
+                                <p class="js-mobile-no"></p>
+                            </div>
+
+                            <div class="field field--radio field--multiplechoice">
+                                <fieldset>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="yes"
+                                               id="yes"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r"
+                                               for="yes">
+                                            Yes, send the text now</label>
+                                    </div>
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--radio js-focusable"
+                                               name="radio-answer"
+                                               value="no"
+                                               id="no"
+                                               type="radio">
+                                        <label class="label label--inline u-fs-r "
+                                               for="no">
+                                            No, I need to change it</label>
+                                    </div>
+                                </fieldset>
+                            </div>
+                        </section>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <!--<p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>-->
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-person-control"
+               name="checkbox-answer" type="checkbox">
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    switchedFromUnemployed = urlParams.get(switchedFromUnemployed),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey'),
+    mobileNo = urlParams.get('mobile');
+
+  $('.qa-btn-submit').on('click', function (e) {
+    e.preventDefault();
+
+    window.location.href = $('[name=radio-answer]:checked').val() === 'yes'
+      ? '../individual-decision-enter-mobile-sent/?person=' + personId +
+        '&remaining=' + encodeURI(urlParams.get('people'))
+      : document.referrer;
+  });
+
+  function updateDescription () {
+    $('.js-mobile-no').html(mobileNo);
+  }
+
+  $(updateDescription);
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-enter-mobile-sent.html b/_prototypes/your-household-v13/individual-decision-enter-mobile-sent.html
new file mode 100644
index 0000000000..5676f62a4e
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-enter-mobile-sent.html
@@ -0,0 +1,88 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../hub">
+                    <div class="group u-mb-l">
+                        <section class="section">
+                            <div class="question u-mb-s">
+                                <h1 id="question-title"
+                                    class="question__title u-fs-l js-heading">
+                                    We have sent the access code to
+                                </h1>
+                                <p class="js-mobile-no"></p>
+
+                                <p>A text with the code should
+                                    arrive shortly with a message on how
+                                    they can complete their own Census</p>
+                            </div>
+                        </section>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Continue
+                    </button>
+
+                    <!--<p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>-->
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-person-control"
+               name="checkbox-answer" type="checkbox">
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    mobileNo = urlParams.get('mobile');
+
+  function updateDescription () {
+    $('.js-mobile-no').html(mobileNo);
+  }
+
+  $(updateDescription);
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-enter-mobile.html b/_prototypes/your-household-v13/individual-decision-enter-mobile.html
new file mode 100644
index 0000000000..af57e4d212
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-enter-mobile.html
@@ -0,0 +1,123 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../hub">
+                    <div class="group u-mb-l">
+                        <section class="section">
+                            <div class="question u-mb-s">
+                                <h1 id="question-title"
+                                    class="question__title u-fs-l js-heading">
+                                    What is <span
+                                        class="js-remaining-name"></span>
+                                    mobile number?
+                                </h1>
+                                <p>We will send an access code by text to
+                                    this number</p>
+                            </div>
+
+                            <div class="field">
+                                <label class="label" for="mobile-number">
+                                    <div class="label__inner">
+                                        Enter mobile number
+                                    </div>
+                                </label>
+                                <input class="input input--text"
+                                       id="mobile-number"
+                                       value="" />
+                            </div>
+                        </section>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <!--<p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>-->
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-person-control"
+               name="checkbox-answer" type="checkbox">
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    remaining = JSON.parse(urlParams.get('remaining')) || [],
+    remainingPersonId = remaining.shift(),
+    remainingPerson;
+
+  if (remainingPersonId) {
+    remainingPerson = storageAPI.getHouseholdMemberByPersonId(remainingPersonId)['@person'];
+  }
+
+  $('.qa-btn-submit').on('click', function (e) {
+    e.preventDefault();
+
+    window.location.href = remaining.length
+      ? '../individual-decision-enter-mobile-correct/?person=' + personId +
+        '&remaining=' + encodeURI(JSON.stringify(remaining)) +
+        '&mobile=' + encodeURI($('#mobile-number').val())
+      : '../hub/';
+  });
+
+  /*function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }*/
+
+  function updateQuestion() {
+    $('.js-remaining-name').html(remainingPerson.fullName +
+      window.ONS.utils.trailingNameS(remainingPerson.fullName));
+  }
+
+  $(updateQuestion);
+  //$(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-other-pin.html b/_prototypes/your-household-v13/individual-decision-other-pin.html
new file mode 100644
index 0000000000..61271c8d79
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-other-pin.html
@@ -0,0 +1,126 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Send individual access code
+                                    </h1>
+                                    <p class="mars u-mb-m">
+                                        You can request the access code to be
+                                        sent by text message to their mobile
+                                        phone, or we can post it to them.
+                                    </p>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="no"
+                                                           value="no">
+                                                    <label class="label label--inline venus"
+                                                           for="no"
+                                                           id="no-label">
+                                                        Send access code by
+                                                        text message
+                                                    </label>
+                                                    <div class="field__other">
+                                                        <label
+                                                                class="label venus mercury" for="other-answer" id="label-checkbox-other-input">Enter <span class="js-person-name"></span> mobile number</label>
+                                                        <input class="input input__text js-focusable" id="other-answer" name="other-answer" type="text" data-qa="other-option">
+                                                    </div>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="yes" value="yes">
+                                                    <label class="label label--inline venus"
+                                                           for="yes">
+                                                        Send an access code
+                                                        in the post
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    nobox = document.getElementById("no"),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click', function(e) {
+
+    $('#person').val(personId);
+
+    storageAPI.createPinFor(personId, { exported: true });
+    document.trav.action = "../hub";
+  });
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateName() {
+    $('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+  }
+
+  $(updateName);
+  $(updateRouting);
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-other-secure.html b/_prototypes/your-household-v13/individual-decision-other-secure.html
new file mode 100644
index 0000000000..68020b5052
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-other-secure.html
@@ -0,0 +1,140 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Are you happy to continue answering
+                                        for <span class="js-person-name"></span>
+                                    </h1>
+                                    <p class="mars u-mb-m">
+                                        This section asks you to provide
+                                        information about their age, marital
+                                        status, sexual orientation, health,
+                                        education and employment.
+                                    </p>
+                                    <p class="mars u-mb-m">
+                                        If you are not happy to answer these
+                                        questions and would like them to
+                                        complete their own section you can
+                                        request an individual access pin on
+                                        their behalf.
+                                    </p>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="yes"
+                                                           value="yes">
+                                                    <label class="label label--inline venus"
+                                                           for="yes"
+                                                           id="yes-label">
+                                                        Yes, I am happy to
+                                                        continue
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="no" value="no">
+                                                    <label class="label label--inline venus"
+                                                           for="no">
+                                                        No, I would like to
+                                                        request an access
+                                                        code so they can
+                                                        complete their own
+                                                        section
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    yesbox = document.getElementById("yes"),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click', function(e) {
+
+    $('#person').val(personId);
+
+    /**
+     * Routing
+     */
+    if (yesbox.checked) {
+      storageAPI.setAnsweringIndividualByProxy(true);
+      document.trav.action = "../individual-details-dob";
+    } else {
+      document.trav.action = "../individual-decision-other-pin";
+    }
+  });
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateName() {
+    $('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+  }
+
+  $(updateName);
+  $(updateRouting);
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-pin.html b/_prototypes/your-household-v13/individual-decision-pin.html
new file mode 100644
index 0000000000..340900dcdb
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-pin.html
@@ -0,0 +1,112 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<style>
+    .pin {
+        display : inline-block;
+        padding : .5rem 1rem;
+        background-color : #efefef;
+        border : 1px solid #aaa;
+        letter-spacing: .2rem;
+        font-weight : normal;
+    }
+</style>
+
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-dob">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Your individual access code
+                                    </h1>
+
+                                    <div class="pin saturn u-mb-m">
+                                        34567
+                                    </div>
+
+                                    <p class="venus">
+                                        Make a note of your access code as
+                                        you will need it to view or edit your
+                                        answers once you have signed out.
+                                    </p>
+                                    <p class="mars u-mb-m">
+                                        If you lose your code you won&rsquo;t be
+                                        able to retrieve it and you&rsquo;ll need
+                                        to enter your answers again.
+                                    </p>
+                                </div>
+
+                                <div class="field field--checkbox field--multiplechoice">
+                                    <div class="field__item js-focusable-box">
+                                        <input class="input input--checkbox js-focusable" name="checkbox-answer" value="bacon" id="bacon" type="checkbox">
+                                        <label
+                                                class="label label--inline venus " for="bacon">Send me my access code by text message (optional)</label>
+                                        <div class="field__other">
+                                            <label
+                                                    class="label venus mercury" for="other-answer" id="label-checkbox-other-input">Enter your mobile number</label>
+                                            <input class="input input__text js-focusable" id="other-answer" name="other-answer" type="text" data-qa="other-option">
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Continue with new
+                        individual access code
+                    </button>
+
+                    <div class="u-mb-m"><a
+                            class="js-link-person" href="../individual-decision">Cancel
+                        this and
+                        return me to the survey</a></div>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    returnURL = urlParams.get('returnurl'),
+    pinObj = storageAPI.createPinFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.pin').html(pinObj.pin);
+
+  $('.qa-btn-submit').on('click', function (e) {
+    e.preventDefault();
+    window.location.href = (returnURL ? returnURL :
+      "../individual-details-dob") + '?person=' + personId +
+      (surveyType ? '&survey=' + surveyType : '');
+  });
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision-secure.html b/_prototypes/your-household-v13/individual-decision-secure.html
new file mode 100644
index 0000000000..6c76fc9cac
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision-secure.html
@@ -0,0 +1,148 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="returnurl" id="returnurl"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Do you want to keep your answers
+                                        secure from other people at this
+                                        address?
+                                    </h1>
+                                    <p class="mars u-mb-m">
+                                        We&rsquo;ll provide you with a separate
+                                        access code if you don&rsquo;t want other
+                                        people living at this address to view
+                                        your answers.
+                                    </p>
+                                    <p class="mars u-mb-m">
+                                        An example of this might be if you
+                                        live in a shared or student house.
+                                        You might not want other people to
+                                        have access to information about you
+                                        such as your age, marital status,
+                                        health, education and employment.
+                                    </p>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="no"
+                                                           value="no">
+                                                    <label class="label label--inline venus"
+                                                           for="no"
+                                                           id="no-label">
+                                                        No, I am happy to
+                                                        continue
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="does-anyone-else-live-here"
+                                                           id="yes" value="yes">
+                                                    <label class="label label--inline venus"
+                                                           for="yes">
+                                                        Yes, I would like to
+                                                        submit an individual
+                                                        response using a
+                                                        separate access code
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    returnURL = urlParams.get('returnurl'),
+    nobox = document.getElementById("no"),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click', function(e) {
+
+    $('#person').val(personId);
+    $('#returnurl').val(returnURL);
+
+    /**
+     * Routing
+     */
+    if (nobox.checked) {
+      storageAPI.unsetPinFor(personId);
+
+      /**
+       * Return to URL
+       * @type {string}
+       */
+      document.trav.action = returnURL ? returnURL :
+        "../individual-details-dob";
+    } else {
+      document.trav.action = "../individual-decision-pin";
+    }
+  });
+
+  function updateRouting() {
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateName() {
+    $('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+  }
+
+  $(updateName);
+  $(updateRouting);
+</script>
diff --git a/_prototypes/your-household-v13/individual-decision.html b/_prototypes/your-household-v13/individual-decision.html
new file mode 100644
index 0000000000..218e5213c3
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-decision.html
@@ -0,0 +1,123 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l">
+                                        Are you <span class="js-person-name"></span>?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="is-you"
+                                                           id="yes"
+                                                           value="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes"
+                                                           id="yes-someone-else-label">
+                                                        Yes I am
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="is-you"
+                                                           id="no" value="no">
+                                                    <label class="label label--inline"
+                                                           for="no">
+                                                        No, I am answering on
+                                                        their behalf
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub">Choose another section and return to this later</a></p>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+	var storageAPI = window.ONS.storage,
+        urlParams = new URLSearchParams(window.location.search),
+		personId = urlParams.get('person'),
+        yesbox = document.getElementById("yes"),
+        surveyType = urlParams.get('survey');
+
+	$('.qa-btn-submit').click(function(e) {
+	  var val = yesbox.checked;
+
+      storageAPI.setAnsweringIndividualByProxy(!val);
+      document.trav.action = "../individual-details-sex";
+	});
+
+	function updateRouting () {
+      $('#person').val(personId);
+      $('#survey-type').val(surveyType);
+    }
+
+	function updateName() {
+      $('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+	}
+
+	function updateSelected() {
+	  var answerVal = storageAPI.getAnsweringIndividualByProxy();
+
+      answerVal !== null &&
+        $('#' + (answerVal ? 'no' : 'yes')).attr('checked', true);
+    }
+
+	$(updateName);
+    $(updateRouting);
+    $(updateSelected);
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-address-in-uk.html b/_prototypes/your-household-v13/individual-details-address-in-uk.html
new file mode 100644
index 0000000000..a123f9db9a
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-address-in-uk.html
@@ -0,0 +1,196 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v2.0.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v10.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-dob">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What is your usual address?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div
+                                                        class="field__item js-focusable-box js-extra-option" style="display:none;">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="addrees-where"
+                                                           id="same-as-visitor1"
+                                                           value="same-as-visitor1">
+                                                    <label
+                                                            class="label label--inline js-extra-option-label"
+                                                           for="same-as-visitor1"
+                                                           id="same-as-visitor1-label">
+                                                        Same address as
+                                                        {visitor 1}
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="addrees-where"
+                                                           id="in-uk"
+                                                           value="in-uk">
+                                                    <label class="label label--inline"
+                                                           for="in-uk"
+                                                           id="in-uk-label">
+                                                        An address in the UK
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input
+                                                            class="input input--radio js-focusable" name="addrees-where" value="outside-uk" id="outside-uk" type="radio" data-qa="has-other-option">
+                                                    <label
+                                                            class="label label--inline u-fs-r " for="outside-uk" id="label-radio-answer-other">An address outside the UK</label>
+                                                    <div class="field__other">
+                                                        <label
+                                                                class="label u-fs-s--b" for="other-answer" id="label-checkbox-other-input">Please specify country</label>
+                                                        <input class="input input__text" id="other-answer" name="other-answer" type="text" data-qa="other-option">
+                                                    </div>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    person = member['@person'],
+    isEditing = urlParams.get('edit'),
+    isVisitor = storageAPI.isVisitor(member),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var val = $('[name="addrees-where"]:checked').val();
+    storageAPI.addUpdateAddressWhere(personId, val);
+
+    if(val === 'outside-uk'){
+      storageAPI.addUpdateAddressOutsideUK(personId, $('#other-answer').val());
+    }
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if(isVisitor) {
+      e.preventDefault();
+
+      var routeMap = {
+        'same-as-visitor1': {
+          url: '../hub/?noop=fake'
+        },
+        'in-uk': {
+          url: '../individual-details-address/?person=' + personId
+        },
+        'outside-uk': {
+          url: '../hub/?noop=fake'
+        }
+      };
+
+      window.location.href = routeMap[val].url +
+        (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy() || isVisitor) {
+      $('.js-heading').html('What is ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) + ' usual address?');
+    }
+  }
+
+  function updateAnswer() {
+    var visitors =
+      storageAPI.getAllHouseholdMembers().filter(storageAPI.isVisitor),
+      visitor1 = visitors[0],
+      visitor1Person = visitor1['@person'];
+
+    if((person.id !== visitor1Person.id) && visitors.length > 1) {
+      $('.js-extra-option').show();
+      $('.js-extra-option-label').html('Same address as ' +
+        visitor1Person.fullName);
+    }
+  }
+
+  if (details && details.country) {
+    $('#' + details.country).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateAnswer);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-address.html b/_prototypes/your-household-v13/individual-details-address.html
new file mode 100644
index 0000000000..091659bf63
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-address.html
@@ -0,0 +1,256 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<style>
+    .input--text-lg {
+        width : 100%;
+    }
+
+    .input--text-postcode {
+        max-width : 9.25rem;
+    }
+</style>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v10.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-dob">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn js-heading">
+                                        What is <span class="js-person"></span>
+                                        usual address?
+                                    </h1>
+                                </div>
+
+                                <div class="question__answers">
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-address-line-1">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label venus "
+                                                           for="address-line-1"
+                                                           id="label-address-line-1">
+                                                        <div class="label__inner">
+                                                            Building and street
+                                                        </div>
+                                                    </label>
+                                                    <input
+                                                            class="input input--text input--text-lg u-mb-s"
+                                                            id="address-line-1"
+                                                            name="address-line-1"
+                                                            data-qa="input-text"
+                                                            value=""/>
+
+                                                    <input class="input input--text input--text-lg"
+                                                           id="address-line-2"
+                                                           name="address-line-2"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-town-city">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label venus "
+                                                           for="town-city"
+                                                           id="label-town-city">
+                                                        <div class="label__inner">
+                                                            Town or City
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input class="input input--text "
+                                                           id="town-city"
+                                                           name="town-city"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-county">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label venus "
+                                                           for="county"
+                                                           id="label-county">
+                                                        <div class="label__inner">
+                                                            County (optional)
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input class="input input--text "
+                                                           id="county"
+                                                           name="county"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-postcode">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label venus "
+                                                           for="postcode"
+                                                           id="label-postcode">
+                                                        <div class="label__inner">
+                                                            Postcode
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input
+                                                            class="input input--text input--text-postcode"
+                                                            id="postcode"
+                                                            name="postcode"
+                                                            data-qa="input-text"
+                                                            value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p class="mars">Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="mars u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    person = member['@person'],
+    isEditing = urlParams.get('edit'),
+    isVisitor = storageAPI.isVisitor(member),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    storageAPI.addUpdateAddressIndividual(personId,
+      {
+        'address-line-1': $('#address-line-1').val(),
+        'address-line-2': $('#address-line-2').val(),
+        'town-city': $('#town-city').val(),
+        'county': $('#county').val(),
+        'postcode': $('#postcode').val()
+      }
+    );
+    
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if(isVisitor) {
+      e.preventDefault();
+      window.location.href = '../hub/' + (surveyType ? '?survey=' +
+        surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    $('.js-person').html(person.fullName + window.ONS.utils.trailingNameS(person.fullName));
+
+    /*if(storageAPI.getAnsweringIndividualByProxy() || isVisitor) {
+      $('.js-heading').html('What is ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) + ' usual address?');
+    }*/
+  }
+
+  function updateAnswer() {
+    var visitors =
+      storageAPI.getAllHouseholdMembers().filter(storageAPI.isVisitor),
+      visitor1 = visitors[0],
+      visitor1Person = visitor1['@person'];
+
+    if((person.id !== visitor1Person.id) && visitors.length > 1) {
+      $('.js-extra-option').show();
+      $('.js-extra-option-label').html('Same address as ' +
+        visitor1Person.fullName);
+    }
+  }
+
+  if (details && details.country) {
+    $('#' + details.country).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateAnswer);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-age-confirm.html b/_prototypes/your-household-v13/individual-details-age-confirm.html
new file mode 100644
index 0000000000..67f952144c
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-age-confirm.html
@@ -0,0 +1,179 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v10.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-dob">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="age-confirm"
+                                                           id="yes"
+                                                           value="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes"
+                                                           id="yes-label">
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="age-confirm"
+                                                           id="no"
+                                                           value="no">
+                                                    <label class="label label--inline"
+                                                           for="no"
+                                                           id="no-label">
+                                                        No, I need to change
+                                                        my date of birth
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    person = member['@person'],
+    isEditing = urlParams.get('edit'),
+    isVisitor = storageAPI.isVisitor(member),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    e.preventDefault();
+
+    var route = '',
+      val = $('[name="age-confirm"]:checked').val();
+
+    storageAPI.addUpdateAgeConfirm(personId, val);
+
+    if(isEditing) {
+      route = '../individual-details-summary/';
+    }
+    else if(isVisitor) {
+      route = '../individual-details-dob/';
+    }
+    else {
+      route = val === 'yes' ? '../individual-details-relationship/' :
+        '../individual-details-dob/';
+    }
+
+    window.location.href =
+      route + '?person=' + personId + (surveyType ? '&survey=' + surveyType :'');
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function createDataObj(year, month, day) {
+    return moment(year + '-' + month + '-' + day, 'YYYY-MM-DD');
+  }
+
+  function updateQuestion() {
+    var dob = details.dob,
+      dobObj = createDataObj(dob.year, dob.month, dob.day),
+      age = moment().diff(dobObj, 'years');
+
+    if(!dob) {
+      console.log('Unable to find date of birth for details: ', details);
+    }
+
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html(
+        person.fullName + ' is ' + age + ' years old. Is this correct?'
+      );
+      $('#yes-label').html(
+        'Yes ' + person.fullName + ' is ' + age + ' years old');
+
+      $('#no-label').html('No, I need to change their date of birth');
+    }
+    else {
+      $('.js-heading').html('You are ' + age + ' years old. Is this correct?');
+      $('#yes-label').html('Yes I am ' + age + ' years old');
+    }
+  }
+
+  if (details && details['age-confirm']) {
+    $('#' + details['age-confirm'].val).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-apprenticeship.html b/_prototypes/your-household-v13/individual-details-apprenticeship.html
new file mode 100644
index 0000000000..fed36666ed
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-apprenticeship.html
@@ -0,0 +1,156 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-qualifications-degree">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you completed an apprenticeship?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <p class="u-fs-r">Include equivalent apprenticeships completed anywhere outside England and Wales</p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="has-apprenticeship"
+                                                           id="yes"
+                                                           value="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes"
+                                                           id="yes-label">
+                                                        <strong
+                                                                class="u-fs-r">Yes</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            For example trade, advanced, foundation or modern apprenticeships
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="has-apprenticeship"
+                                                           id="no"
+                                                           value="no">
+                                                    <label class="label label--inline"
+                                                           for="no"
+                                                           id="no-label">
+                                                        <strong
+                                                                class="u-fs-r">No</strong>
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    storageAPI.addUpdateApprenticeship(personId,
+      $('[name="has-apprenticeship"]:checked').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' completed an apprenticeship?');
+    }
+  }
+
+  if (details && details['apprenticeship'] && details['apprenticeship'].hasApprenticeship) {
+    $('#' + details['apprenticeship'].hasApprenticeship).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-country-other.html b/_prototypes/your-household-v13/individual-details-country-other.html
new file mode 100644
index 0000000000..6285ed9b78
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-country-other.html
@@ -0,0 +1,137 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../assets/modules/typeahead/typeahead.css"/>
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-national-identity">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        You selected ‘Elsewhere’ for your country of birth, can you specify this further?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="typeahead js-typeahead u-mt-m" data-content="{&quot;no_results&quot;:&quot;No results found&quot;,&quot;aria_no_results&quot;:&quot;No results found for the query&quot;,&quot;aria_you_have_selected&quot;:&quot;You have selected&quot;,&quot;aria_found_by_alternative_name&quot;:&quot;found by alternative name&quot;,&quot;aria_min_chars&quot;:&quot;Type in 2 or more characters for results.&quot;,&quot;aria_one_result&quot;:&quot;There is one result available.&quot;,&quot;aria_n_results&quot;:&quot;There are {n} results available.&quot;,&quot;aria_limited_results&quot;:&quot;Results have been limited to 10 results. Type more characters to refine your search.&quot;,&quot;more_results&quot;:&quot;Continue typing to refine results&quot;}" data-api-url="https://ons-typeahead-prototypes.herokuapp.com/country-of-birth">
+                                            <label class="label js-typeahead-label" for="country-of-birth-input">
+                                                Enter your country of birth
+                                            </label>
+                                            <div class="typeahead__combobox js-typeahead-combobox" role="combobox" aria-has-popup="country-of-birth-listbox" aria-expanded="false">
+                                                <input type="hidden" id="country-of-birth-code" class="input input--text input-type__input js-typeahead-code" name="country-of-birth-code" />
+                                                <div class="field">
+                                                    <input type="text" id="country-of-birth-preview" class="input input--text input-type__input typeahead__preview js-typeahead-preview" readonly="true" aria-hidden="true" tabindex="-1" />
+                                                </div>
+                                                <div class="field u-mt-no">
+                                                    <input type="text" id="country-of-birth-input" class="input input--text input-type__input typeahead__input js-typeahead-input" name="country-of-birth-input" data-autocomplete="off" />
+                                                </div>
+                                                <div class="typeahead__instructions u-vh js-typeahead-instructions" id="country-of-birth-instructions">Use up and down keys to navigate results once you&#39;ve typed more than two characters. Use the enter key to select a result. Touch device users, explore by touch or with swipe gestures.</div>
+                                                <ul class="typeahead__listbox js-typeahead-listbox" role="listbox" id="country-of-birth-listbox"></ul>
+                                                <div class="typeahead__status u-vh js-typeahead-aria-status" aria-live="polite" role="status"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var otherText = $('#country-of-birth-input').val();
+
+    storageAPI.addUpdateCountryOther(personId, otherText);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('You selected ‘Elsewhere’ for ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) +
+        ' Country of brith, can you specify this further?');
+    }
+  }
+
+  if (details && details['country'] &&
+    details['country'].otherText) {
+    $('#country-of-birth-input').val(details['country'].otherText);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  document.dispatchEvent(new CustomEvent('TYPEAHEAD-READY'));
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-country.html b/_prototypes/your-household-v13/individual-details-country.html
new file mode 100644
index 0000000000..50ac3f6a7c
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-country.html
@@ -0,0 +1,198 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-national-identity">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What is your country of birth?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="england"
+                                                           value="england">
+                                                    <label class="label label--inline"
+                                                           for="england"
+                                                           id="england-label">
+                                                        England
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="wales"
+                                                           value="wales">
+                                                    <label class="label label--inline"
+                                                           for="wales"
+                                                           id="wales-label">
+                                                        Wales
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="scotland"
+                                                           value="scotland">
+                                                    <label class="label label--inline"
+                                                           for="scotland"
+                                                           id="scotland-label">
+                                                        Scotland
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="northern-ireland"
+                                                           value="northern-ireland">
+                                                    <label class="label label--inline"
+                                                           for="northern-ireland"
+                                                           id="northern-ireland-label">
+                                                        Northern Ireland
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="republic-ireland"
+                                                           value="republic-ireland">
+                                                    <label class="label label--inline"
+                                                           for="republic-ireland"
+                                                           id="republic-ireland-label">
+                                                        Republic of Ireland
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="country"
+                                                           id="elsewhere"
+                                                           value="elsewhere">
+                                                    <label class="label label--inline"
+                                                           for="elsewhere"
+                                                           id="elsewhere-label">
+                                                        Elsewhere
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var val = $('[name="country"]:checked').val();
+    storageAPI.addUpdateCountry(personId, val);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if(val === 'elsewhere') {
+      e.preventDefault();
+      window.location.href = '../individual-details-country-other/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '') +
+        (isEditing ? '&edit=true' : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('What is ' + person.fullName +
+      window.ONS.utils.trailingNameS(person.fullName) +
+        ' country of birth?');
+    }
+  }
+
+  if (details && details.country && details.country.val) {
+    $('#' + details.country.val).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-dob.html b/_prototypes/your-household-v13/individual-details-dob.html
new file mode 100644
index 0000000000..0dca3e6f53
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-dob.html
@@ -0,0 +1,177 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate=""
+                      action="../individual-details-age-confirm">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What is your date of birth?
+                                    </h1>
+                                    <p class="question__description">For
+                                        example 20 03 1980</p>
+                                </div>
+
+                                <div class="answer answer--date">
+                                    <div
+                                            class="answer__fields js-fields u-mb-xl">
+                                        <fieldset
+                                                class="fieldgroup fieldgroup--inline fieldgroup--date" data-qa="widget-date">
+
+                                            <div class="fieldgroup__fields">
+                                                <div class="field field--input input--w-2">
+                                                    <label class="label" for="personal-detail-dob-day">
+                                                        Day
+                                                    </label>
+                                                    <input
+                                                            id="personal-detail-dob-day"
+                                                            value="" data-qa="input-StringField" class="input input--StringField ">
+                                                </div>
+
+                                                <div class="field field--select field--month">
+                                                    <label class="label" for="personal-detail-dob-month">
+                                                        Month
+                                                    </label>
+                                                    <input type="text"
+                                                           id="personal-detail-dob-month"
+                                                           class="input input--text input-type__input input--w-2"
+                                                           name="month"
+                                                           min="1"
+                                                           max="12"
+                                                           pattern="[0-9]*"
+                                                           inputmode="numeric"
+                                                           autocomplete="bday-month" />
+                                                </div>
+
+                                                <div class="field field--input field--year">
+                                                    <label class="label" for="personal-detail-dob-year">
+                                                        Year
+                                                    </label>
+                                                    <input
+                                                            id="personal-detail-dob-year"
+                                                            value="" data-qa="input-StringField" class="input input--StringField input--w-4">
+                                                </div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub"
+                           class="js-choose-another-section">Choose another
+                            section and
+                            return
+                            to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    person = member['@person'],
+    isEditing = urlParams.get('edit'),
+    isVisitor = storageAPI.isVisitor(member),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdatePersonalDetailsDOB(personId,
+      $('#personal-detail-dob-day').val(),
+      $('#personal-detail-dob-month').val(),
+      $('#personal-detail-dob-year').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if(isVisitor){
+      e.preventDefault();
+      window.location.href = '../individual-details-address-in-uk/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateAnswer() {
+    var details = storageAPI.getPersonalDetailsFor(personId);
+
+    if (details && details.dob) {
+      details.dob.day && $('#personal-detail-dob-day').val(details.dob.day);
+      details.dob.month && $('#personal-detail-dob-month').val(details.dob.month);
+      details.dob.year && $('#personal-detail-dob-year').val(details.dob.year);
+    }
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy() || isVisitor) {
+      $('.js-heading').html('What is ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) + ' date of birth?');
+    }
+  }
+
+  $(updateAnswer);
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(personId);
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-employment-status.html b/_prototypes/your-household-v13/individual-details-employment-status.html
new file mode 100644
index 0000000000..485c7cd71d
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-employment-status.html
@@ -0,0 +1,192 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-job-title">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        In your main job, what is your
+                                            employment status?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="radio-group"
+                                                           id="employee"
+                                                           value="employee">
+                                                    <label class="label label--inline"
+                                                           for="employee"
+                                                           id="employee-label">
+                                                        <strong
+                                                                class="u-fs-r">Employee</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="radio-group"
+                                                           id="freelance-without-employees"
+                                                           value="freelance-without-employees">
+                                                    <label class="label label--inline"
+                                                           for="freelance-without-employees"
+                                                           id="freelance-without-employees-label">
+                                                        <strong
+                                                                class="u-fs-r">Self-employed or freelance without employees</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="radio-group"
+                                                           id="freelance-with-employees"
+                                                           value="freelance-with-employees">
+                                                    <label class="label label--inline"
+                                                           for="freelance-with-employees"
+                                                           id="freelance-with-employees-label">
+                                                        <strong
+                                                                class="u-fs-r">Self-employed with employees</strong>
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="radio-group"
+                                                           id="not-employed"
+                                                           value="not-employed" />
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="not-employed">
+                                                        <span class="u-vh">Or,</span>
+                                                        Not employed
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    var val = $('[name="radio-group"]:checked').val();
+
+    storageAPI.addUpdateEmploymentStatus(personId, val);
+
+    if(isEditing) {
+      e.preventDefault();
+
+      if(val === 'not-employed') {
+        window.location.href = '../individual-details-summary/?person=' + personId +
+          (surveyType ? '&survey=' + surveyType : '');
+      }
+      else {
+        /**
+         * Pass through to specify additional details
+         */
+        window.location.href = '../individual-details-job-title/?person=' + personId +
+          (surveyType ? '&survey=' + surveyType : '') +
+          '&switchedFromUnemployed=true';
+      }
+    }
+    else if(val === 'not-employed') {
+      e.preventDefault();
+
+      storageAPI.clearPersonalBookmark(personId);
+      window.location.href = '../individual-decision-answer-behalf/?person=' + personId;
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('In ' + person.fullName +
+        ' main job, what is their employment status?');
+    }
+  }
+
+  if (details && details['employment-status']) {
+    $('#' + details['employment-status'].val).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-ethnic-group-description.html b/_prototypes/your-household-v13/individual-details-ethnic-group-description.html
new file mode 100644
index 0000000000..061437ee77
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-ethnic-group-description.html
@@ -0,0 +1,181 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-passport-country">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Which of these best describes your ethnic group or background?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl"
+                                                      id="radio-placeholder">
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div class="field__item js-focusable-box js-radio-template"
+     style="display:none;">
+    <input class="input input--radio js-focusable js-radio-input"
+           type="radio"
+           name="ethnic-description"
+           id=""
+           value="">
+    <label class="label label--inline js-radio-label"
+           for=""
+           id="-label">
+        <strong class="u-fs-r js-radio-label-strong"></strong>
+    </label>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    ethnicGroup = urlParams.get('ethnic-group'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var val = $('[name="ethnic-description"]:checked').val();
+
+    storageAPI.addUpdateEthnicGroupDescription(personId, val);
+
+    if(val === 'other' && ethnicGroup !== 'other') {
+      e.preventDefault();
+      window.location.href =
+        '../individual-details-ethnic-group-other/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '') +
+        (ethnicGroup ? '&ethnic-group=' + ethnicGroup : '') +
+        (isEditing ? '&edit=true' : '');
+    }
+    else if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    var str = 'Which of these best describes ' +
+      (storageAPI.getAnsweringIndividualByProxy()
+        ? person.fullName + window.ONS.utils.trailingNameS(person.fullName)
+        : 'your') +
+      ' ' + storageAPI.personalDetailsEthnicGroupMap[ethnicGroup].question +
+      ' ethnic group or background?';
+
+    $('.js-heading').html(str);
+  }
+
+  var $fieldEls =
+    storageAPI.personalDetailsEthnicGroupMap[ethnicGroup].options.map(function (item) {
+    var $template = $('.js-radio-template').clone(),
+      $radioInput = $template.find('.js-radio-input'),
+      $label = $template.find('.js-radio-label');
+
+    $template.attr('id', '');
+    $template.find('.js-radio-label-strong').html(item.label);
+    $template.css('display', '');
+
+    $radioInput.attr('id', item.val);
+    $radioInput.attr('value', item.val);
+
+    if(item.val === details['ethnic-group'].description) {
+      $radioInput.attr('checked', true);
+    }
+
+    $label.attr('id', item.val + '-label');
+    $label.attr('for', item.val);
+
+    return $template;
+  });
+
+  function updateAnswer() {
+    $('#radio-placeholder').append(
+      /**
+       * Interlace break tags - temp fix for double banking display issues
+       */
+      _.flatten(
+        _.zip($fieldEls, _.range($fieldEls.length).map(function (){
+          return $('<br />');
+        }))
+      )
+    );
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+  $(updateAnswer);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-ethnic-group-other.html b/_prototypes/your-household-v13/individual-details-ethnic-group-other.html
new file mode 100644
index 0000000000..8185c1c708
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-ethnic-group-other.html
@@ -0,0 +1,177 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../assets/modules/typeahead/typeahead.css"/>
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-passport-country">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        You selected ‘Other White background’ for your White ethnic group, can you specify this further?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div
+                                                class="typeahead js-typeahead u-mt-m" data-content="{&quot;no_results&quot;:&quot;No results found&quot;,&quot;aria_no_results&quot;:&quot;No results found for the query&quot;,&quot;aria_you_have_selected&quot;:&quot;You have selected&quot;,&quot;aria_found_by_alternative_name&quot;:&quot;found by alternative name&quot;,&quot;aria_min_chars&quot;:&quot;Type in 2 or more characters for results.&quot;,&quot;aria_one_result&quot;:&quot;There is one result available.&quot;,&quot;aria_n_results&quot;:&quot;There are {n} results available.&quot;,&quot;aria_limited_results&quot;:&quot;Results have been limited to 10 results. Type more characters to refine your search.&quot;,&quot;more_results&quot;:&quot;Continue typing to refine results&quot;}">
+                                            <label class="label js-typeahead-label" for="ethnic-group-input">
+                                                Enter your ethnic group or background
+                                            </label>
+                                            <div class="typeahead__combobox js-typeahead-combobox" role="combobox" aria-has-popup="ethnic-group-listbox" aria-expanded="false">
+                                                <input type="hidden"
+                                                       id="ethnic-group-code" class="input input--text input-type__input js-typeahead-code" name="ethnic-group-code" />
+                                                <div class="field">
+                                                    <input type="text" id="ethnic-group-preview" class="input input--text input-type__input typeahead__preview js-typeahead-preview" readonly="true" aria-hidden="true" tabindex="-1" />
+                                                </div>
+                                                <div class="field u-mt-no">
+                                                    <input type="text" id="ethnic-group-input" class="input input--text input-type__input typeahead__input js-typeahead-input" name="ethnic-group-input" data-autocomplete="off" />
+                                                </div>
+                                                <div class="typeahead__instructions u-vh js-typeahead-instructions" id="ethnic-group-instructions">Use up and down keys to navigate results once you&#39;ve typed more than two characters. Use the enter key to select a result. Touch device users, explore by touch or with swipe gestures.</div>
+                                                <ul class="typeahead__listbox js-typeahead-listbox" role="listbox" id="ethnic-group-listbox"></ul>
+                                                <div class="typeahead__status u-vh js-typeahead-aria-status" aria-live="polite" role="status"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    ethnicGroup = urlParams.get('ethnic-group'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  ethnicGroupMap = {
+    'white': {
+      'question': 'Other White ethnic group or background',
+      'category': 'White',
+      'api-endpoint': 'ethnic-groups-white'
+    },
+    'mixed': {
+      'question': 'Any other Mixed or Multiple background',
+      'category': 'Mixed or Multiple',
+      'api-endpoint': 'ethnic-groups-mixed'
+    },
+    'asian': {
+      'question': 'Other Asian ethnic group or background',
+      'category': 'Asian or Asian British',
+      'api-endpoint': 'ethnic-groups-asian'
+    },
+    'black': {
+      'question': 'Any other Black, African or Caribbean background',
+      'category': 'Black, African, Caribbean or Black British',
+      'api-endpoint': 'ethnic-groups-black'
+    }/*,
+    'other': {
+      'question': ''
+    }*/
+  };
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var otherText = $('#ethnic-group-input').val();
+
+    storageAPI.addUpdateEthnicGroupOther(personId, otherText);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    var str = 'You selected ‘' + ethnicGroupMap[ethnicGroup].question + '’ for ' +
+      (storageAPI.getAnsweringIndividualByProxy()
+        ? person.fullName + window.ONS.utils.trailingNameS(person.fullName)
+        : 'your') +
+      ' ' + ethnicGroupMap[ethnicGroup].category +
+      ' ethnic group, can you specify this further?';
+
+    $('.js-heading').html(str);
+  }
+
+  function updateAnswer() {
+    $('.js-typeahead').attr('data-api-url',
+      'https://ons-typeahead-prototypes.herokuapp.com/' +
+      ethnicGroupMap[ethnicGroup]['api-endpoint']);
+
+    document.dispatchEvent(new CustomEvent('TYPEAHEAD-READY'));
+    //data-api-url="https://ons-typeahead-prototypes.herokuapp.com/ethnic-groups-white"
+  }
+
+  if (details && details['ethnic-group'] &&
+    details['ethnic-group'].otherText) {
+    $('#ethnic-group-input').val(details['ethnic-group'].otherText);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+  $(updateAnswer);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-ethnic-group.html b/_prototypes/your-household-v13/individual-details-ethnic-group.html
new file mode 100644
index 0000000000..819198102a
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-ethnic-group.html
@@ -0,0 +1,220 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-ethnic-group-description">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What is your ethnic group?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="ethnic-group"
+                                                           id="white"
+                                                           value="white">
+                                                    <label class="label label--inline"
+                                                           for="white"
+                                                           id="white-label">
+                                                        <strong class="u-fs-r">White</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Include British,
+                                                            Northern Irish,
+                                                            Irish, Gypsy, Irish
+                                                            Traveller, Roma or
+                                                            any other White
+                                                            background
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="ethnic-group"
+                                                           id="mixed"
+                                                           value="mixed">
+                                                    <label class="label label--inline"
+                                                           for="mixed"
+                                                           id="mixed-label">
+                                                        <strong class="u-fs-r">Mixed or Multiple
+                                                            ethnic groups</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Includes White and
+                                                            Black Caribbean,
+                                                            White and Black
+                                                            African, White and
+                                                            Asian or any other
+                                                            Mixed or Multiple
+                                                            backgrounds
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="ethnic-group"
+                                                           id="asian"
+                                                           value="asian">
+                                                    <label class="label label--inline"
+                                                           for="asian"
+                                                           id="asian-label">
+                                                        <strong class="u-fs-r">Asian or Asian
+                                                            British</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Includes Indian,
+                                                            Pakistani,
+                                                            Bangladeshi, Chinese
+                                                            or any other Asian
+                                                            background
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="ethnic-group"
+                                                           id="black"
+                                                           value="black">
+                                                    <label class="label label--inline"
+                                                           for="black"
+                                                           id="black-label">
+                                                        <strong class="u-fs-r">Black, Caribbean,
+                                                            African or Black
+                                                            British</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Includes Black British, Caribbean, African or any other Black background
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="ethnic-group"
+                                                           id="other"
+                                                           value="other">
+                                                    <label class="label label--inline"
+                                                           for="other"
+                                                           id="other-label">
+                                                        <strong class="u-fs-r">Other ethnic group</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Includes Arab or any other ethnic group
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var val = $('[name="ethnic-group"]:checked').val();
+
+    storageAPI.addUpdateEthnicGroup(personId, val);
+
+    /**
+     * Will always need to elaborate further on this question
+     */
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-ethnic-group-description/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '') +
+        '&ethnic-group=' + val +
+        (isEditing ? '&edit=true' : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('What is ' + person.fullName +
+      window.ONS.utils.trailingNameS(person.fullName) +
+        ' ethnic group?');
+    }
+  }
+
+  if (details && details['ethnic-group']) {
+    $('#' + details['ethnic-group'].val).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-job-describe.html b/_prototypes/your-household-v13/individual-details-job-describe.html
new file mode 100644
index 0000000000..424b92c289
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-job-describe.html
@@ -0,0 +1,141 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Can you briefly  describe what you do in your main job?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <label class="label u-fs-r "
+                                               for="text-input"
+                                               id="label-lim">Job description
+                                        </label>
+
+                                        <textarea id="text-input"
+                                                  class="input input--textarea js-charlimit-input" cols="60"
+                                                  rows="8" id="textarea-answer-lim" name="textarea-answer-lim"
+                                                  maxlength="200"
+                                                  aria-describedby="description-question"
+                                                  data-maxlength="200"
+                                                  data-char-limit-ref="textarea-answer-lim-remaining"
+                                        ></textarea>
+                                        <div class="input__limit u-mt-xs u-fs-s--b" data-qa="textarea-with-limit" id="textarea-answer-lim-remaining" aria-live="polite"
+                                             data-charcount-singular="You have {x} character remaining"
+                                             data-charcount-plural="You have {x} characters remaining">
+                                            You have 200 characters remaining</div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    switchedFromUnemployed = urlParams.get(switchedFromUnemployed),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    e.preventDefault();
+
+    var url = '';
+
+    storageAPI.addUpdateJobDescribe(personId, $('#text-input').val());
+    storageAPI.clearPersonalBookmark(personId);
+
+    if(isEditing || switchedFromUnemployed) {
+      url += '../individual-details-summary/?person=';
+    }
+    else {
+      url += '../individual-decision-answer-behalf/?person=';
+    }
+
+    url += personId + (surveyType ? ('&survey=' + surveyType) : '');
+    window.location.href = url;
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Can you briefly describe what ' + person.fullName +
+        ' does in their main job?');
+    }
+  }
+
+  if (details && details['job-describe'] &&
+    details['job-describe'].val) {
+    $('#text-input').val(details['job-describe'].val);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(urlParams.get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-job-title.html b/_prototypes/your-household-v13/individual-details-job-title.html
new file mode 100644
index 0000000000..e0534a8423
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-job-title.html
@@ -0,0 +1,143 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../assets/modules/typeahead/typeahead.css"/>
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-job-describe">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        In your main job, what is your job title?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="typeahead js-typeahead u-mt-m" data-content="{&quot;no_results&quot;:&quot;No results found&quot;,&quot;aria_no_results&quot;:&quot;No results found for the query&quot;,&quot;aria_you_have_selected&quot;:&quot;You have selected&quot;,&quot;aria_found_by_alternative_name&quot;:&quot;found by alternative name&quot;,&quot;aria_min_chars&quot;:&quot;Type in 2 or more characters for results.&quot;,&quot;aria_one_result&quot;:&quot;There is one result available.&quot;,&quot;aria_n_results&quot;:&quot;There are {n} results available.&quot;,&quot;aria_limited_results&quot;:&quot;Results have been limited to 10 results. Type more characters to refine your search.&quot;,&quot;more_results&quot;:&quot;Continue typing to refine results&quot;}" data-api-url="https://ons-typeahead-prototypes.herokuapp.com/occupation">
+                                            <label class="label js-typeahead-label" for="job-title-input">
+                                                Enter your job title
+                                            </label>
+                                            <div class="typeahead__combobox js-typeahead-combobox" role="combobox" aria-has-popup="job-title-listbox" aria-expanded="false">
+                                                <input type="hidden" id="job-title-code" class="input input--text input-type__input js-typeahead-code" name="job-title-code" />
+                                                <div class="field">
+                                                    <input type="text" id="job-title-preview" class="input input--text input-type__input typeahead__preview js-typeahead-preview" readonly="true" aria-hidden="true" tabindex="-1" />
+                                                </div>
+                                                <div class="field u-mt-no">
+                                                    <input type="text" id="job-title-input" class="input input--text input-type__input typeahead__input js-typeahead-input" name="job-title-input" data-autocomplete="off" />
+                                                </div>
+                                                <div class="typeahead__instructions u-vh js-typeahead-instructions" id="job-title-instructions">Use up and down keys to navigate results once you&#39;ve typed more than two characters. Use the enter key to select a result. Touch device users, explore by touch or with swipe gestures.</div>
+                                                <ul class="typeahead__listbox js-typeahead-listbox" role="listbox" id="job-title-listbox"></ul>
+                                                <div class="typeahead__status u-vh js-typeahead-aria-status" aria-live="polite" role="status"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    switchedFromUnemployed = urlParams.get('switchedFromUnemployed'),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdateJobTitle(personId, $('#job-title-input').val());
+
+    if(switchedFromUnemployed) {
+      e.preventDefault();
+      window.location.href = '../individual-details-job-describe/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '') +
+        '&switchedFromUnemployed=true';
+    }
+    else if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('In ' + person.fullName +
+        ' main job, what is your job title?');
+    }
+  }
+
+  if (details && details['job-title'] &&
+    details['job-title'].val) {
+    $('#job-title-input').val(details['job-title'].val);
+  }
+
+  document.dispatchEvent(new CustomEvent('TYPEAHEAD-READY'));
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-national-identity-other.html b/_prototypes/your-household-v13/individual-details-national-identity-other.html
new file mode 100644
index 0000000000..a32315810a
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-national-identity-other.html
@@ -0,0 +1,140 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../assets/modules/typeahead/typeahead.css"/>
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-ethnic-group">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        You selected ‘Other’ for your national identity, can you specify this further?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div
+                                                class="typeahead js-typeahead u-mt-m" data-content="{&quot;no_results&quot;:&quot;No results found&quot;,&quot;aria_no_results&quot;:&quot;No results found for the query&quot;,&quot;aria_you_have_selected&quot;:&quot;You have selected&quot;,&quot;aria_found_by_alternative_name&quot;:&quot;found by alternative name&quot;,&quot;aria_min_chars&quot;:&quot;Type in 2 or more characters for results.&quot;,&quot;aria_one_result&quot;:&quot;There is one result available.&quot;,&quot;aria_n_results&quot;:&quot;There are {n} results available.&quot;,&quot;aria_limited_results&quot;:&quot;Results have been limited to 10 results. Type more characters to refine your search.&quot;,&quot;more_results&quot;:&quot;Continue typing to refine results&quot;}" data-api-url="https://ons-typeahead-prototypes.herokuapp.com/national-identity">
+                                            <label class="label js-typeahead-label" for="national-identity-input">
+                                                Enter your national identity
+                                            </label>
+                                            <div class="typeahead__combobox js-typeahead-combobox" role="combobox" aria-has-popup="national-identity-listbox" aria-expanded="false">
+                                                <input type="hidden"
+                                                       id="national-identity-code" class="input input--text input-type__input js-typeahead-code" name="national-identity-code" />
+                                                <div class="field">
+                                                    <input type="text" id="national-identity-preview" class="input input--text input-type__input typeahead__preview js-typeahead-preview" readonly="true" aria-hidden="true" tabindex="-1" />
+                                                </div>
+                                                <div class="field u-mt-no">
+                                                    <input type="text" id="national-identity-input" class="input input--text input-type__input typeahead__input js-typeahead-input" name="national-identity-input" data-autocomplete="off" />
+                                                </div>
+                                                <div class="typeahead__instructions u-vh js-typeahead-instructions" id="national-identity-instructions">Use up and down keys to navigate results once you&#39;ve typed more than two characters. Use the enter key to select a result. Touch device users, explore by touch or with swipe gestures.</div>
+                                                <ul class="typeahead__listbox js-typeahead-listbox" role="listbox" id="national-identity-listbox"></ul>
+                                                <div class="typeahead__status u-vh js-typeahead-aria-status" aria-live="polite" role="status"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var otherText = $('#national-identity-input').val();
+
+    storageAPI.addUpdateNationalIdentityOther(personId, otherText);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('You selected ‘Other’ for ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) +
+        ' national identity, can you specify this further?');
+    }
+  }
+
+  if (details && details['national-identity'] &&
+    details['national-identity'].otherText) {
+    $('#national-identity-input').val(details['national-identity'].otherText);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  document.dispatchEvent(new CustomEvent('TYPEAHEAD-READY'));
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-national-identity.html b/_prototypes/your-household-v13/individual-details-national-identity.html
new file mode 100644
index 0000000000..945b6701c1
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-national-identity.html
@@ -0,0 +1,205 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-ethnic-group">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        How would you describe your national identity?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="collapsible collapsible--simple js-collapsible js-collapsible-simple u-mb-s">
+                                    <div class="js-collapsible-content">
+                                        <h3
+                                                class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs-r--b" data-ga="click" data-ga-category="definition" data-ga-action="Open panel" data-ga-label="What is national identity?">What is national identity?</h3>
+                                        <div class="collapsible__body js-collapsible-body">
+                                            <p>To do</p>
+                                            <button
+                                                    class="btn btn--secondary btn--small js-collapsible-close u-no-js-hide" data-ga="click" data-ga-category="definition" data-ga-action="Close panel" data-ga-label="What is national identity?">Hide this</button>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset>
+                                                <legend
+                                                        class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox" name="checkbox-answer" value="english" id="english" type="checkbox" />
+                                                    <label class="label label--inline u-fs-r"
+                                                           for="english">
+                                                        English</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox" name="checkbox-answer" value="welsh" id="welsh" type="checkbox" />
+                                                    <label class="label label--inline u-fs-r"
+                                                           for="welsh">
+                                                        Welsh</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox" name="checkbox-answer" value="scottish" id="scottish" type="checkbox" />
+                                                    <label class="label label--inline u-fs-r"
+                                                           for="scottish">
+                                                        Scottish</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox" name="checkbox-answer" value="northern-irish" id="northern-irish" type="checkbox" />
+                                                    <label class="label label--inline u-fs-r"
+                                                           for="northern-irish">
+                                                        Northern Irish</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox" name="checkbox-answer" value="british" id="british" type="checkbox" />
+                                                    <label class="label label--inline u-fs-r"
+                                                           for="british">
+                                                        British</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input
+                                                            id="other"
+                                                            name="checkbox-answer" value="other" data-qa="has-other-option" type="checkbox" class="input input--checkbox">
+                                                    <label id="label-checkbox-mandatory-answer-1" class="label label--inline u-fs-r" for="other">Other<br>
+                                                        <!--<span class="label__description label__inner u-fs-s">An answer is required.</span>-->
+                                                    </label>
+                                                    <!--<div class="field__other">
+                                                        <label class="label u-fs-r u-fs-s&#45;&#45;b"
+                                                               for="other-answer"
+                                                               id="label-checkbox-other-input">Please specify other</label>
+                                                        <input id="other-answer" name="other-answer-mandatory" data-qa="other-option" type="text" class="input">
+                                                    </div>-->
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var nationalIdentities = [],
+      otherText = $('#other-answer').val();
+
+    $('[name="checkbox-answer"]:checked').each(function(i, el) {
+      nationalIdentities.push($(el).val());
+    });
+
+    storageAPI.addUpdateNationalIdentity(personId, nationalIdentities,
+      otherText);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if($('#other:checked').length) {
+      e.preventDefault();
+      window.location.href = '../individual-details-national-identity-other/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '') +
+        (isEditing ? '&edit=true' : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('How would you describe ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) +
+        ' national identity?');
+    }
+  }
+
+  (function () {
+    if (details && details['national-identity'] && details['national-identity'].collection) {
+      var collection = details['national-identity'].collection;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+
+      $('#other-answer').val(details['national-identity'].otherText);
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-orientation.html b/_prototypes/your-household-v13/individual-details-orientation.html
new file mode 100644
index 0000000000..67967b1fe4
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-orientation.html
@@ -0,0 +1,187 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-salary">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Which of the following best describes your sexual orientation?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="orientation"
+                                                           id="straight"
+                                                           value="straight">
+                                                    <label class="label label--inline"
+                                                           for="straight"
+                                                           id="straight-label">
+                                                        Straight or heterosexual
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="orientation"
+                                                           id="gay"
+                                                           value="gay">
+                                                    <label class="label label--inline"
+                                                           for="gay"
+                                                           id="gay-label">
+                                                        Gay or lesbian
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="orientation"
+                                                           id="bisexual"
+                                                           value="bisexual">
+                                                    <label class="label label--inline"
+                                                           for="bisexual"
+                                                           id="bisexual-label">
+                                                        Bisexual
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="orientation"
+                                                           id="other"
+                                                           value="other">
+                                                    <label class="label label--inline"
+                                                           for="other"
+                                                           id="other-label">
+                                                        Other sexual
+                                                        orientation, please
+                                                        specify...
+                                                    </label>
+                                                    <div class="field__other">
+                                                        <!--<label
+                                                                class="label mercury" for="other-answer" id="label-checkbox-other-input">Enter your mobile number</label>-->
+                                                        <input class="input input__text js-focusable" id="other-answer" name="orientation" type="text" data-qa="other-option">
+                                                    </div>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="orientation"
+                                                           id="no-say"
+                                                           value="no-say">
+                                                    <label class="label label--inline"
+                                                           for="no-say"
+                                                           id="no-say-label">
+                                                        Prefer not to say
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    storageAPI.addUpdateOrientation(personId,
+      $('[name="orientation"]:checked').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Which of the following options best describes how you think of ' +
+        person.fullName + window.ONS.utils.trailingNameS(person.fullName)
+        +' sexual orientation?');
+    }
+  }
+
+  if (details && details.orientation) {
+    $('#' + details.orientation).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-passport-country-other.html b/_prototypes/your-household-v13/individual-details-passport-country-other.html
new file mode 100644
index 0000000000..238e37d6b5
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-passport-country-other.html
@@ -0,0 +1,134 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../assets/modules/typeahead/typeahead.css"/>
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-apprenticeship">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        You selected ‘Other’ for the passport you hold, can you specify this further?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="typeahead js-typeahead u-mt-m" data-content="{&quot;no_results&quot;:&quot;No results found&quot;,&quot;aria_no_results&quot;:&quot;No results found for the query&quot;,&quot;aria_you_have_selected&quot;:&quot;You have selected&quot;,&quot;aria_found_by_alternative_name&quot;:&quot;found by alternative name&quot;,&quot;aria_min_chars&quot;:&quot;Type in 2 or more characters for results.&quot;,&quot;aria_one_result&quot;:&quot;There is one result available.&quot;,&quot;aria_n_results&quot;:&quot;There are {n} results available.&quot;,&quot;aria_limited_results&quot;:&quot;Results have been limited to 10 results. Type more characters to refine your search.&quot;,&quot;more_results&quot;:&quot;Continue typing to refine results&quot;}" data-api-url="https://ons-typeahead-prototypes.herokuapp.com/passport">
+                                            <label class="label js-typeahead-label" for="passport-country-other-input">
+                                                Enter the country where your passport was issued
+                                            </label>
+                                            <div class="typeahead__combobox js-typeahead-combobox" role="combobox" aria-has-popup="passport-country-other-listbox" aria-expanded="false">
+                                                <input type="hidden" id="passport-country-other-code" class="input input--text input-type__input js-typeahead-code" name="passport-country-other-code" />
+                                                <div class="field">
+                                                    <input type="text" id="passport-country-other-preview" class="input input--text input-type__input typeahead__preview js-typeahead-preview" readonly="true" aria-hidden="true" tabindex="-1" />
+                                                </div>
+                                                <div class="field u-mt-no">
+                                                    <input type="text" id="passport-country-other-input" class="input input--text input-type__input typeahead__input js-typeahead-input" name="passport-country-other-input" data-autocomplete="off" />
+                                                </div>
+                                                <div class="typeahead__instructions u-vh js-typeahead-instructions" id="passport-country-other-instructions">Use up and down keys to navigate results once you&#39;ve typed more than two characters. Use the enter key to select a result. Touch device users, explore by touch or with swipe gestures.</div>
+                                                <ul class="typeahead__listbox js-typeahead-listbox" role="listbox" id="passport-country-other-listbox"></ul>
+                                                <div class="typeahead__status u-vh js-typeahead-aria-status" aria-live="polite" role="status"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdatePassportCountryOther(personId, $('#passport-country-other-input').val());
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('You selected ‘Other’ for the passport ' + person.fullName +
+        ' holds, can you specify this further?');
+    }
+  }
+
+  if (details && details['passport'] && details['passport'].otherText) {
+    $('#passport-country-other-input').val(details['passport'].otherText);
+  }
+
+  document.dispatchEvent(new CustomEvent('TYPEAHEAD-READY'));
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-passport-country.html b/_prototypes/your-household-v13/individual-details-passport-country.html
new file mode 100644
index 0000000000..745371979f
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-passport-country.html
@@ -0,0 +1,191 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-apprenticeship/">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-l">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What passport do you hold?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="passport-country"
+                                                            value="united-kingdom"
+                                                            id="united-kingdom"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="united-kingdom"
+                                                           id="united-kingdom-label">
+                                                        United Kingdom</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="passport-country"
+                                                           value="ireland"
+                                                           id="ireland"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="ireland"
+                                                           id="ireland-label">
+                                                        Ireland</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="passport-country"
+                                                           value="other"
+                                                           id="other"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="other"
+                                                           id="other-label">
+                                                        Other</label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="passport-country"
+                                                           value="none"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none"
+                                                           id="none-label">
+                                                        <span class="u-vh">Or,</span>
+                                                        None<span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var passportCountries = [];
+
+    $('[name="passport-country"]:checked').each(function(i, el) {
+      passportCountries.push($(el).val());
+    });
+
+    storageAPI.addUpdatePassportCountry(personId, passportCountries);
+
+    if($('#other:checked').length) {
+      e.preventDefault();
+      window.location.href =
+        '../individual-details-passport-country-other/?person=' + personId +
+        (surveyType ? '&survey=' + surveyType : '') +
+        (isEditing ? '&edit=true' : '');
+    }
+    else if(isEditing) { console.log('editing');
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('What passport does ' + person.fullName +
+        ' hold?');
+    }
+  }
+
+  (function () {
+    if (details && details['passport'] && details['passport'].countries) {
+      var collection = details['passport'].countries;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-qualifications-a-level.html b/_prototypes/your-household-v13/individual-details-qualifications-a-level.html
new file mode 100644
index 0000000000..334efffc89
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-qualifications-a-level.html
@@ -0,0 +1,215 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-qualifications-gcse">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you achieved an AS, A level or equivalent qualification?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <p class="u-fs-r">Include equivalent qualifications achieved anywhere outside England and Wales</p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="checkbox-answer"
+                                                            value="a-level-2"
+                                                            id="a-level-2"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="a-level-2"
+                                                           id="a-level-2-label">
+                                                        <strong
+                                                                class="u-fs-r">2 or more A levels</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Include 4 or more AS levels
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="a-level-1-btec"
+                                                           id="a-level-1-btec"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="a-level-1-btec"
+                                                           id="a-level-1-btec-label">
+                                                        <strong class="u-fs-r">1 A level</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            For example BTEC General, City and Guilds Craft
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="a-level-1"
+                                                           id="a-level-1"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="a-level-1"
+                                                           id="a-level-1-label">
+                                                        <strong class="u-fs-r">1 AS level</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="baccalaureate"
+                                                           id="baccalaureate"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="baccalaureate"
+                                                           id="baccalaureate-label">
+                                                        <strong class="u-fs-r">Advanced Welsh Baccalaureate</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="checkbox-answer"
+                                                           value="none"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none"
+                                                           id="none-label">
+                                                        <span class="u-vh">Or,</span>
+                                                        None<span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var aLevels = [];
+
+    $('[name="checkbox-answer"]:checked').each(function(i, el) {
+      aLevels.push($(el).val());
+    });
+
+    storageAPI.addUpdateQualificationsALevel(personId, aLevels);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' achieved an AS, A level or equivalent qualification?');
+    }
+  }
+
+  (function () {
+    if (details && details['qualifications'] &&
+      details['qualifications'].aLevels) {
+      var collection = details['qualifications'].aLevels;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-qualifications-degree.html b/_prototypes/your-household-v13/individual-details-qualifications-degree.html
new file mode 100644
index 0000000000..d304a298c5
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-qualifications-degree.html
@@ -0,0 +1,157 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-qualifications-nvq-equivalent">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you achieved a qualification at degree level or above?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <p class="u-fs-r">Include equivalent qualifications achieved anywhere outside England and Wales</p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="checkbox-answer"
+                                                           id="yes"
+                                                           value="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes"
+                                                           id="yes-label">
+                                                        <strong
+                                                                class="u-fs-r">Yes</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            For example degree, foundation degree, HND or HNC, NVQ level 4 and above, teaching or nursing
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="checkbox-answer"
+                                                           id="no"
+                                                           value="no">
+                                                    <label class="label label--inline"
+                                                           for="no"
+                                                           id="no-label">
+                                                        <strong
+                                                                class="u-fs-r">No</strong>
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdateHasQualificationAbove(personId,
+      $('[name="checkbox-answer"]:checked').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' achieved a qualification at degree level or above?');
+    }
+  }
+
+  if (details && details['qualifications'] && details['qualifications'].aboveDegree) {
+    $('#' + details['qualifications'].aboveDegree).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-qualifications-gcse.html b/_prototypes/your-household-v13/individual-details-qualifications-gcse.html
new file mode 100644
index 0000000000..be3d094fa8
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-qualifications-gcse.html
@@ -0,0 +1,231 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-qualifications-other-where">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you achieved a GCSE or equivalent qualification?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <p class="u-fs-r">Include equivalent qualifications achieved anywhere outside England and Wales</p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="checkbox-answer"
+                                                            value="gcse-5"
+                                                            id="gcse-5"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="gcse-5"
+                                                           id="gcse-5-label">
+                                                        <strong
+                                                                class="u-fs-r">5 or more GCSEs grades A* to C or 9 to 4
+                                                        </strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Include 5 or more O level passes or CSEs grades 1
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="other-gcses"
+                                                           id="other-gcses"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="other-gcses"
+                                                           id="other-gcses-label">
+                                                        <strong class="u-fs-r">Any other GCSEs</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Include any other O levels or CSEs at any grades
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="basic-skills"
+                                                           id="basic-skills"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="basic-skills"
+                                                           id="basic-skills-label">
+                                                        <strong class="u-fs-r">Basic skills course</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            Skills for life, literacy, numeracy and language
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="national-baccalaureate"
+                                                           id="national-baccalaureate"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="national-baccalaureate"
+                                                           id="national-baccalaureate-label">
+                                                        <strong class="u-fs-r">National Welsh Baccalaureate</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="foundation-baccalaureate"
+                                                           id="foundation-baccalaureate"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="foundation-baccalaureate"
+                                                           id="foundation-baccalaureate-label">
+                                                        <strong class="u-fs-r">Foundation Welsh Baccalaureate</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="checkbox-answer"
+                                                           value="none"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none"
+                                                           id="none-label">
+                                                        <span class="u-vh">Or,</span>
+                                                        None of these apply<span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var collection = [];
+
+    $('[name="checkbox-answer"]:checked').each(function(i, el) {
+      collection.push($(el).val());
+    });
+
+    storageAPI.addUpdateQualificationsGCSEs(personId, collection);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' achieved a GCSE or equivalent qualification?');
+    }
+  }
+
+  (function () {
+    if (details && details['qualifications'] &&
+      details['qualifications'].gcses) {
+      var collection = details['qualifications'].gcses;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-qualifications-nvq-equivalent.html b/_prototypes/your-household-v13/individual-details-qualifications-nvq-equivalent.html
new file mode 100644
index 0000000000..9020b38f09
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-qualifications-nvq-equivalent.html
@@ -0,0 +1,205 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-qualifications-a-level">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you achieved an NVQ or equivalent qualification?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <p class="u-fs-r">Include equivalent qualifications achieved anywhere outside England and Wales</p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="checkbox-answer"
+                                                            value="nvq-level-1"
+                                                            id="nvq-level-1"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="nvq-level-1"
+                                                           id="nvq-level-1-label">
+                                                        <strong
+                                                                class="u-fs-r">NVQ level 1 or equivalent</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            For example BTEC National, OND or ONC, City and Guilds Advanced Craft
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="nvq-level-2"
+                                                           id="nvq-level-2"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="nvq-level-2"
+                                                           id="nvq-level-2-label">
+                                                        <strong
+                                                                class="u-fs-r">NVQ level 2 or equivalent</strong>
+                                                        <p class="u-fs-s u-db u-mb-no label--negative">
+                                                            For example BTEC General, City and Guilds Craft
+                                                        </p>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="nvq-level-3"
+                                                           id="nvq-level-3"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="nvq-level-3"
+                                                           id="nvq-level-3-label">
+                                                        <strong
+                                                                class="u-fs-r">NVQ level 3 or equivalent</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="checkbox-answer"
+                                                           value="none"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none"
+                                                           id="none-label">
+                                                        <span class="u-vh">Or,</span>
+                                                        None<span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var nvqEquivalent = [];
+
+    $('[name="checkbox-answer"]:checked').each(function(i, el) {
+      nvqEquivalent.push($(el).val());
+    });
+
+    storageAPI.addUpdateQualificationsNvqEquivalent(personId, nvqEquivalent);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' achieved an NVQ or equivalent qualification?');
+    }
+  }
+
+  (function () {
+    if (details && details['qualifications'] &&
+      details['qualifications'].nvqEquivalent) {
+      var collection = details['qualifications'].nvqEquivalent;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-qualifications-other-where.html b/_prototypes/your-household-v13/individual-details-qualifications-other-where.html
new file mode 100644
index 0000000000..075ab380e6
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-qualifications-other-where.html
@@ -0,0 +1,179 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-employment-status">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        Have you achieved any other qualifications?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="checkbox-answer"
+                                                            value="in-england-wales"
+                                                            id="in-england-wales"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="in-england-wales"
+                                                           id="in-england-wales-label">
+                                                        <strong
+                                                                class="u-fs-r">Yes, in England or Wales
+                                                        </strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="checkbox-answer"
+                                                           value="outside-england-wales"
+                                                           id="outside-england-wales"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="outside-england-wales"
+                                                           id="outside-england-wales-label">
+                                                        <strong class="u-fs-r">Yes, anywhere outside of England and Wales</strong>
+                                                    </label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="checkbox-answer"
+                                                           value="none"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none"
+                                                           id="none-label">
+                                                        <span class="u-vh">Or,</span>
+                                                        No qualifications<span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+    var collection = [];
+
+    $('[name="checkbox-answer"]:checked').each(function(i, el) {
+      collection.push($(el).val());
+    });
+
+    storageAPI.addUpdateQualificationsOtherWhere(personId, collection);
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('Has ' + person.fullName +
+        ' achieved any other qualifications?');
+    }
+  }
+
+  (function () {
+    if (details && details['qualifications'] &&
+      details['qualifications'].othersWhere) {
+      var collection = details['qualifications'].othersWhere;
+
+      $.each(collection, function (i, val) {
+        $('#' + val).attr('checked', true);
+      });
+    }
+  }());
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-relationship.html b/_prototypes/your-household-v13/individual-details-relationship.html
new file mode 100644
index 0000000000..3d93af784e
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-relationship.html
@@ -0,0 +1,244 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-country">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        On <span
+                                            class="js-significant-date"></span>,
+                                        what is your legal marital or
+                                        registered civil partnership status?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="never"
+                                                           value="never">
+                                                    <label class="label label--inline"
+                                                           for="never"
+                                                           id="never-label">
+                                                        Never married and
+                                                        never registered a
+                                                        civil partnership
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="married"
+                                                           value="married">
+                                                    <label class="label label--inline"
+                                                           for="married"
+                                                           id="married-label">
+                                                        Married
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="registered"
+                                                           value="registered">
+                                                    <label class="label label--inline"
+                                                           for="registered"
+                                                           id="registered-label">
+                                                        In a registered civil
+                                                        partnership
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="separated-married"
+                                                           value="separated-married">
+                                                    <label class="label label--inline"
+                                                           for="separated-married"
+                                                           id="separated-married-label">
+                                                        Separated, but still
+                                                        legally married
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="separated-partnership"
+                                                           value="separated-partnership">
+                                                    <label class="label label--inline"
+                                                           for="separated-partnership"
+                                                           id="separated-partnership-label">
+                                                        Separated, but still
+                                                        legally in a civil partnership
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="divorced"
+                                                           value="divorced">
+                                                    <label class="label label--inline"
+                                                           for="divorced"
+                                                           id="divorced-label">
+                                                        Divorced
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="former-partnership"
+                                                           value="former-partnership">
+                                                    <label class="label label--inline"
+                                                           for="former-partnership"
+                                                           id="former-partnership-label">
+                                                        Formerly in a
+                                                        civil partnership
+                                                        which is now legally
+                                                        dissolved
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="widowed"
+                                                           value="widowed">
+                                                    <label class="label label--inline"
+                                                           for="widowed"
+                                                           id="widowed-label">
+                                                        Widowed
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="marital-status"
+                                                           id="surviving-partner"
+                                                           value="surviving-partner">
+                                                    <label class="label label--inline"
+                                                           for="surviving-partner"
+                                                           id="surviving-partner-label">
+                                                        Surviving partner
+                                                        from a registered civil
+                                                        partnership
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return
+                            to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    details = storageAPI.getPersonalDetailsFor(personId),
+    isEditing = urlParams.get('edit'),
+    surveyType = urlParams.get('survey');
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdateMaritalStatus(personId,
+      $('[name="marital-status"]:checked').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('What is ' + person.fullName +
+      window.ONS.utils.trailingNameS(person.fullName) +
+        ' legal marital or same-sex civil partnership status?');
+    }
+  }
+
+  if (details && details.maritalStatus) {
+    $('#' + details.maritalStatus).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-salary.html b/_prototypes/your-household-v13/individual-details-salary.html
new file mode 100644
index 0000000000..a5f87306c8
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-salary.html
@@ -0,0 +1,136 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" action="../individual-details-summary">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What was your gross pay, that is your
+                                        pay before any deductions, the last
+                                        time you were paid?
+                                    </h1>
+                                </div>
+
+                                <div id="question-info"
+                                     class="panel panel--simple panel--info u-mb-l">
+                                    <div class="panel__body">
+                                        <p>
+                                            <strong>Exclude</strong>
+                                            expenses (if possible)
+                                        </p>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div
+                                            class="answer__fields js-fields u-mb-xl">
+                                        <div class="field">
+                                            <label class="label"
+                                                   for="text-input">Gross pay
+                                                last time you were paid
+                                            </label>
+                                            <input class="input input--text" type="text" id="text-input">
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'],
+    isEditing = urlParams.get('edit'),
+    surveyType = urlParams.get('survey');
+
+  $('#text-input').val(storageAPI.getPersonalDetailsFor(personId).salary);
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function (e) {
+
+    storageAPI.addUpdateSalary(personId,
+      $('#text-input').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy()) {
+      $('.js-heading').html('What was ' + person.fullName +
+      window.ONS.utils.trailingNameS(person.fullName) +
+        ' gross pay, that is ' + person.fullName +
+      window.ONS.utils.trailingNameS(person.fullName) +
+        ' pay before any deductions, the last time they were paid?');
+    }
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-sex.html b/_prototypes/your-household-v13/individual-details-sex.html
new file mode 100644
index 0000000000..7554798658
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-sex.html
@@ -0,0 +1,154 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v10.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off"
+                      action="../individual-details-dob">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title u-fs-l js-heading">
+                                        What is your sex?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice ">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="sex"
+                                                           id="female"
+                                                           value="female">
+                                                    <label class="label label--inline"
+                                                           for="female"
+                                                           id="female-label">
+                                                        Female
+                                                    </label>
+                                                </div>
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="sex"
+                                                           id="male"
+                                                           value="male">
+                                                    <label class="label label--inline"
+                                                           for="male"
+                                                           id="male-label">
+                                                        Male
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                    <p>Can't complete this question?<br />
+                        <a href="../hub" class="js-choose-another-section">Choose another section and
+                            return to this later</a></p>
+
+                    <!--<p class="u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    person = member['@person'],
+    isEditing = urlParams.get('edit'),
+    isVisitor = storageAPI.isVisitor(member),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    surveyType = urlParams.get('survey');
+
+
+  $('.qa-btn-submit').on('click',
+    storageAPI.personalQuestionSubmitDecorator.bind(null, personId, function(e) {
+
+    storageAPI.addUpdateSex(personId,
+      $('[name="sex"]:checked').val()
+    );
+
+    if(isEditing) {
+      e.preventDefault();
+      window.location.href = '../individual-details-summary/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+
+    if(isVisitor) {
+      e.preventDefault();
+      window.location.href = '../individual-details-dob/?person=' +
+        personId + (surveyType ? '&survey=' + surveyType : '');
+    }
+  }));
+
+  function updateRouting() {
+    if(surveyType) {
+      $('.js-choose-another-section').attr('href', '../hub/?survey=' + surveyType);
+    }
+    $('#survey-type').val(surveyType);
+  }
+
+  function updateQuestion() {
+    if(storageAPI.getAnsweringIndividualByProxy() || isVisitor) {
+      $('.js-heading').html('What is ' + person.fullName +
+        window.ONS.utils.trailingNameS(person.fullName) + ' sex?');
+    }
+  }
+
+  if (details && details.sex) {
+    $('#' + details.sex).attr('checked', true);
+  }
+
+  $(updateQuestion);
+  $(updateRouting);
+
+  /**
+   * Routing
+   */
+  $('#person').val(new URLSearchParams(window.location.search).get('person'));
+</script>
diff --git a/_prototypes/your-household-v13/individual-details-summary.html b/_prototypes/your-household-v13/individual-details-summary.html
new file mode 100644
index 0000000000..e3727683d9
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-details-summary.html
@@ -0,0 +1,790 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../visitors">Previous</a>
+    </div>
+</div>
+
+<style>
+    .completed {
+        position: relative;
+    }
+
+    .completed::before {
+        z-index:2;
+        content:"";
+        background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAbCAYAAAAZMl2nAAAABGdBTUEAALGPC/xhBQAAAjtJREFUSA29l0FLW0EQx2f2NWDSQ196sFBELKFfwVMPNcmLFZV68eRFPBd6K4IexKT0IHjpqdDi0aMg5iCKUvDkqdBDQYiKIIJY0oO1wZhMd0L3+V6yz+TlrZ1DNjOzM/9f9u1uEoD/aH3Lk/EgORGUMB1/VHDeXf4u7z9ZyvXqeqMuaDqWLGTf1Ov0sdEX8UdMWJmLuc0zr869g9iL2RlC+gwEHi08eCB60j/nN04VjCepQuZGe9GZJqAvANS6BRBKIobp8uz2CSu2TjDEcScEaxCk6Jq+2h9eDbB7LyBtIVhZGgEMQLVaXKAFYfzRdArBIFL8EgWOlOe394yCdAvBUBa/NNvTT+MJa7B/rSf7/KyyUzpuzuv10KBDcr2WPMMTV+Z+i3O2jUKtt2O+Hh3TC3lhUCO7lezQuBNFLJYSAV2BZY7/mNndVzDuagOB+7oroIHiCXJkE1G+Kj/NOjn2vmYLgng2QIAglSgTxGtB6spAbVzGTENwTiQiTeWdLfvKMEgkcEaqAYgrr8DDwxmwq9h7RppTPFYhIKGgFEGu+jM4hiAHRqmkIlmoc38rO0fdE5llJfi+9ljF33+hY/uV9m1w3r9OVULXuPRISRtVrx7AQ3MQFYccETDcQLSBRYbqF0IJ0CxMFIhAkLExUiDtBOoUxAdEWxAdDOCF9qXtrpiC4o+/U3Er43/Fpig+lTuQ9zPdMA8YkBKt1BMITK7uH3xLp1Ln8eTdqGoL7hzY777yV/1NehC5sU/AXb484yamkz/AAAAAASUVORK5CYII=") no-repeat 50%;
+        background-size:1rem;
+        position:absolute;
+        left:9px;left:-1.5rem;
+        width:1.2em;
+        height:1.2em;
+        bottom:0;
+        top:0;
+        margin:auto;
+    }
+</style>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v10.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" action="../hub">
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section"
+                                     id="total-retail-turnover-section">
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1
+                                            class="question__title u-fs-l">
+                                        <span class="js-person-fullname-from-url-id"></span>
+                                    </h1>
+                                </div>
+
+                                <div class="panel panel--simple panel--success"
+                                     id="question-guidance-everyone-at-address-confirmation-question">
+                                    <strong class="u-mb-s">This section
+                                        is now complete</strong>
+                                    <p>You can check your
+                                        answers below</p>
+                                </div>
+                                <br />
+
+                                <div class="summary u-mb-xl">
+
+                                    <!-- Personal Details -->
+                                    <div class="summary__block">
+                                        <div class="summary__item">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Full name</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer"><span class="js-person-fullname-from-url-id"></span></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a href="#edit">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-dob-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Date of birth</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-dob"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-dob/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-country-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Country of birth</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-country"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-country/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-address-individual-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Address</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-address-individual"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-address/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-marital-status-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Marital status</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-marital-status"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-relationship/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-sexual-orientation-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Sexual orientation</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-orientation"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-orientation/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-gender-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Gender</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-gender"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-sex/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="summary__item js-salary-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Salary</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-salary"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-salary/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Health and Identity -->
+                                        <div
+                                                class="summary__item js-national-identity-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">National identity</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-national-identity"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-national-identity/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-ethinic-group-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Ethnic group</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-ethinic-group"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-ethnic-group/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-passport-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Passport</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-passport"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-passport-country/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-apprenticeship-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Has apprenticeship</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-apprenticeship"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-apprenticeship/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-degree-qualification-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Has degree qualification</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-degree-qualification"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-qualifications-degree/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-nvq-qualification-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">NVQ qualifications</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-nvq-qualification"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-qualifications-nvq-equivalent/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-a-level-qualification-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">AS, A level or equivalent qualifications</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-a-level-qualification"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-qualifications-a-level/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-gcse-qualification-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">GCSE or equivalent qualifications</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-gcse-qualification"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-qualifications-gcse/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-other-qualification-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Other places qualified</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-other-qualification"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-qualifications-other-where/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-employment-status-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Employment status</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-employment-status"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-employment-status/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-job-title-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Job title</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-job-title"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-job-title/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div
+                                                class="summary__item js-job-description-field" style="display:none;">
+                                            <div class="grid">
+                                                <div class="grid__col col-12@xs col-6@m">
+                                                    <div
+                                                            class="summary__question">Job description</div>
+                                                </div>
+                                                <div class="grid__col col-8@xs col-4@m">
+                                                    <div
+                                                            class="summary__answer js-job-description"></div>
+                                                </div>
+                                                <div class="grid__col col-4@xs col-2@m">
+                                                    <div class="summary__link">
+                                                        <a
+                                                                class="js-change-person-link"
+                                                                href="../individual-details-job-describe/?edit=true">Change
+                                                            <span class="u-vh"></span>
+                                                        </a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button
+                            class="btn btn--primary btn--lg qa-btn-submit u-mb-xl"
+                            type="submit" name="">Continue
+                    </button>
+
+                    <!--<p class="mars u-mb-m"><span class="js-link-secure-label"></span><br />
+                        <a class="js-link-secure"
+                           href="#">Get a separate access code to submit an
+                            individual response</a></p>-->
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    details = storageAPI.getPersonalDetailsFor(personId),
+    member = storageAPI.getHouseholdMemberByPersonId(personId),
+    surveyType = urlParams.get('survey'),
+    visitors = storageAPI.getAllHouseholdMembers().filter(storageAPI.isVisitor),
+    visitor1 = visitors.length ? visitors[0] : null;
+
+  function createDataObj(year, month, day) {
+    return moment(year + '-' + month + '-' + day, 'YYYY-MM-DD');
+  }
+
+  function formatAddress(address) {
+    return address['address-line-1'] + '<br />' +
+      address['address-line-2'] + '<br />' +
+      address['county'] + '<br />' +
+      address['town-city'] + '<br />' +
+      address['postcode'] + '<br />';
+  }
+
+  function getDescriptionOf(config) {
+    return config.description;
+  }
+
+  function createAnswerList(collection, getTextCallback) {
+    return $('<ul class="u-m-no"></ul>').append(
+      collection.map(function (item) {
+        return $('<li></li>').html(getTextCallback(item))
+      })
+    )
+  }
+
+  function showHouseholdMemberFields() {
+
+    /**
+     * Date of birth
+     */
+    $('.js-dob-field').show();
+    $('.js-dob').html(
+      createDataObj(details.dob.year, details.dob.month, details.dob.day)
+        .format('MMMM Do YYYY')
+    );
+
+    /**
+     * Marital status
+     */
+    $('.js-marital-status-field').show();
+    $('.js-marital-status').html(getDescriptionOf(storageAPI.personalDetailsMaritalStatusMap[details.maritalStatus]));
+
+    /**
+     * Country
+     */
+    $('.js-country-field').show();
+    $('.js-country').html(
+      details.country.val === 'elsewhere'
+        ? details.country.otherText
+        : getDescriptionOf(storageAPI.personalDetailsCountryMap[details.country.val])
+    );
+
+    /**
+     * Gender
+     */
+    $('.js-gender-field').show();
+    $('.js-gender').html(getDescriptionOf(storageAPI.personalDetailsGenderMap[details.sex]));
+
+    /**
+     * National identity
+     */
+    $('.js-national-identity-field').show();
+    $('.js-national-identity').html(
+      createAnswerList(details['national-identity'].collection, function (dataItem) {
+        return (dataItem !== 'other'
+          ? storageAPI.personalDetailsNationalIdentityMap[dataItem].description
+          : details['national-identity'].otherText
+        );
+      })
+    );
+
+    /**
+     * Enthnic group
+     */
+    (function () {
+      var ethnicGroup = details['ethnic-group'];
+
+      $('.js-ethinic-group-field').show();
+      $('.js-ethinic-group').html(
+        storageAPI.personalDetailsEthnicGroupMap[ethnicGroup.val].question +
+
+        (ethnicGroup.description
+          ? ': ' +
+            _.find(
+              storageAPI.personalDetailsEthnicGroupMap[ethnicGroup.val].options,
+              function (option) {
+                return option.val === ethnicGroup.description;
+              }
+            ).label
+          : ''
+        ) +
+
+        (ethnicGroup.otherText ? ': ' + ethnicGroup.otherText : '')
+      );
+    })();
+
+    /**
+     * Passport
+     */
+    $('.js-passport-field').show();
+    $('.js-passport').html(
+      createAnswerList(details['passport'].countries, function (dataItem) {
+        return (dataItem !== 'other'
+          ?
+            storageAPI.personalDetailsPassportCountriesMap[dataItem].description
+          : details['passport'].otherText
+        );
+      })
+    );
+
+    /**
+     * Apprenticeship
+     */
+    $('.js-apprenticeship-field').show();
+    $('.js-apprenticeship').html(getDescriptionOf(storageAPI.personalDetailsApprenticeshipMap[details.apprenticeship.hasApprenticeship]));
+
+    /**
+     * Degree qualifications
+     */
+    $('.js-degree-qualification-field').show();
+    $('.js-degree-qualification').html(getDescriptionOf(storageAPI.personalDetailsDegreeAboveMap[details.qualifications.aboveDegree]));
+
+    /**
+     * NVQ qualifications
+     */
+    $('.js-nvq-qualification-field').show();
+    $('.js-nvq-qualification').html(
+      createAnswerList(details['qualifications'].nvqEquivalent, function (dataItem) {
+        return getDescriptionOf(storageAPI.personalDetailsNVQMap[dataItem]);
+      })
+    );
+
+    /**
+     * A level qualifications
+     */
+    $('.js-a-level-qualification-field').show();
+    $('.js-a-level-qualification').html(
+      createAnswerList(details['qualifications'].aLevels, function (dataItem) {
+        return getDescriptionOf(storageAPI.personalDetailsALevelMap[dataItem]);
+      })
+    );
+
+    /**
+     * GCSE qualifications
+     */
+    $('.js-gcse-qualification-field').show();
+    $('.js-gcse-qualification').html(
+      createAnswerList(details['qualifications'].gcses, function (dataItem) {
+        return getDescriptionOf(storageAPI.personalDetailsGCSEMap[dataItem]);
+      })
+    );
+
+    /**
+     * Other qualifications
+     */
+    $('.js-other-qualification-field').show();
+    $('.js-other-qualification').html(
+      createAnswerList(details['qualifications'].othersWhere, function (dataItem) {
+        return getDescriptionOf(storageAPI.personalDetailsOtherWhere[dataItem]);
+      })
+    );
+
+    /**
+     * Employment status
+     */
+    $('.js-employment-status-field').show();
+    $('.js-employment-status').html(
+      getDescriptionOf(storageAPI.personalDetailsEmploymentStatus[details['employment-status'].val])
+    );
+
+    /**
+     * Job title
+     */
+    if(details['employment-status'].val !== 'not-employed') {
+      $('.js-job-title-field').show();
+      $('.js-job-title').html(details['job-title'].val);
+    }
+
+    /**
+     * Job description
+     */
+    if(details['employment-status'].val !== 'not-employed') {
+      $('.js-job-description-field').show();
+      $('.js-job-description').html(details['job-describe'].val);
+    }
+
+    /*$('.js-sexual-orientation-field').show();
+    $('.js-orientation').html(storageAPI.personalDetailsOrientationMap[details.orientation].description);*/
+
+    /*$('.js-salary-field').show();
+    $('.js-salary').html(details.salary);*/
+  }
+
+  function showVisitorFields() {
+    var visitor1PersonalDetails,
+      $addressContainer = $('.js-address-individual-field');
+
+    /**
+     * Address
+     */
+    if(details['address-where'] === 'same-as-visitor1') {
+      visitor1PersonalDetails =
+        storageAPI.getPersonalDetailsFor(visitor1['@person'].id);
+
+      $addressContainer.find('.js-change-person-link').attr('href', '../individual-details-address-in-uk/?edit=true');
+
+      $addressContainer.show();
+      $('.js-address-individual').html(formatAddress(visitor1PersonalDetails.address));
+    }
+    else if(details['address-where'] === 'outside-uk') {
+      $addressContainer.show();
+      $('.js-address-individual').html(details['address-outside-uk'] +
+        ' (Outside UK)');
+    }
+    else {
+      $addressContainer.show();
+      $('.js-address-individual').html(formatAddress(details.address));
+    }
+
+    $('.js-gender-field').show();
+    $('.js-gender').html(storageAPI.personalDetailsGenderMap[details.sex].description);
+
+    $('.js-dob-field').show();
+    $('.js-dob').html(
+      createDataObj(details.dob.year, details.dob.month, details.dob.day)
+        .format('MMMM Do YYYY')
+    );
+  }
+
+  function updateRouting() {
+    $('#survey-type').val(surveyType);
+  }
+
+  $(function () {
+    /**
+     * Branch
+     */
+    storageAPI.isVisitor(member)
+      ? showVisitorFields()
+      : showHouseholdMemberFields();
+
+    /**
+     * Update links
+     */
+    $('.js-change-person-link').each(function () {
+      $(this).attr('href', $(this).attr('href') + '&person=' + personId +
+        (surveyType ? '&survey=' + surveyType : ''));
+    });
+  });
+
+  $(updateRouting);
+
+</script>
diff --git a/_prototypes/your-household-v13/individual-intro.html b/_prototypes/your-household-v13/individual-intro.html
new file mode 100644
index 0000000000..ef8b0a9123
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-intro.html
@@ -0,0 +1,87 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../confirm-address">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.yourHouseholdV4_navigationItemsPersonalDetails
+            nav-title-id="section-individual" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-xl">
+                    <div class="block">
+                        <section class="section">
+                            <h1 class="u-fs-l js-person-name"></h1>
+
+                            <!--<p>In this sub section, we’re going to
+                                ask you questions about <span class="js-person-name"></span>.
+                            </p>-->
+                            <p>In this section, we’re going to ask you
+                                questions about <span class="js-person-name"></span>.
+                            </p>
+
+                            <h3 class="u-fs-m">Information you need:</h3>
+                            <ul>
+                                <li>Personal details such as date of birth,
+                                    country of birth, religion etc.</li>
+                                <li>Education and qualifications</li>
+                                <li>Employment and travel to work</li>
+                                <li>Second or holiday homes</li>
+                                <li>Unpaid care and health</li>
+                                <li>Languages</li>
+                            </ul>
+
+                            <!--<h3 class="u-fs-m">Submitting an individual response</h3>
+                            <p>When completing this section, we will ask you if you would like to submit an
+                            individual response. Choose this option if you don&rsquo;t want other people at this address to view
+                            your answers</p>-->
+                        </section>
+                    </div>
+                </div>
+
+                <button class="btn btn--primary btn--lg qa-btn-submit btn-submit"
+                        type="submit" name="">Continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    personId = urlParams.get('person'),
+    surveyType = urlParams.get('survey');
+
+  $('.btn-submit').click(function(e) {
+    e.preventDefault();
+
+    window.location = '../individual-decision/?person=' + personId +
+      (surveyType ? '&survey=' + surveyType : '');
+  });
+
+  function updateName() {
+    $('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+  }
+
+  $(updateName);
+</script>
+
+
+
diff --git a/_prototypes/your-household-v13/individual-pin-security.html b/_prototypes/your-household-v13/individual-pin-security.html
new file mode 100644
index 0000000000..8e45419f9a
--- /dev/null
+++ b/_prototypes/your-household-v13/individual-pin-security.html
@@ -0,0 +1,121 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-12@m">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <input type="hidden" name="person" id="person"
+                           value="#"/>
+                    <input type="hidden" name="survey" id="survey-type"
+                           value="#"/>
+                    <div class="group u-mb-xl">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Enter the individual access code
+                                    </h1>
+
+                                    <p class="question__description">
+                                        You’ll need the code you were provided when you chose to submit an individual response.
+                                    </p>
+
+                                    <div class="definition u-mb-l js-details"
+                                         data-hide-label="Click to collapse." data-show-label="Click to expand.">
+                                        <a href="#definition"
+                                           class="definition__link mars js-details-trigger u-no-js-hide icon--details" aria-expanded="false" data-js-accordion-event-label="Help with individual access code" data-ga-label="definition-pattern-library" data-ga-action="Definition click" data-ga="click" data-ga-category="Help">Help with individual access code <span class="u-vh js-details-label">Click to expand.</span></a>
+
+                                        <h3 class="venus u-no-js-show u-mb-no">Help with individual access code</h3>
+
+                                        <div id="definition" class="definition__main js-details-body" aria-hidden="true">
+                                            <div class="definition__content mars">
+                                                <p>If you&rsquo;ve lost your code,
+                                                    you&rsquo;ll need to enter your
+                                                    details again. For
+                                                    further help, call us on
+                                                    0300 1234 931 or send an
+                                                    email to
+                                                <a href="mailto:surveys@ons.gov.uk">surveys@ons
+                                                    .gov.uk</a>.
+                                                </p>
+                                            </div>
+                                            <button
+                                                    class="btn btn--secondary btn--small definition__content-close-trigger js-details-trigger u-no-js-hide">Hide this</button>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field">
+                                            <label class="label venus "
+                                                   for="text-input">Enter
+                                                your access code to continue
+                                            </label>
+                                            <input class="input input--text" type="text" id="text-input">
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mb-xl"
+                            type="submit" name="">Submit access code
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+	var storageAPI = window.ONS.storage,
+        urlParams = new URLSearchParams(window.location.search),
+		personId = urlParams.get('person'),
+        pinObj = storageAPI.getPinFor(personId),
+        returnURL = urlParams.get('returnurl'),
+        surveyType = urlParams.get('survey');
+
+	$('.question__title').append(' <span style="color:white">' + pinObj.pin +
+      '</span>');
+
+	$('.qa-btn-submit').click(function(e) {
+
+	  if (pinObj.pin + '' !== $('#text-input').val() + '') {
+	    e.preventDefault();
+	    return false;
+      }
+
+	  $('#person').val(personId);
+      document.trav.action = returnURL;
+	});
+
+    function updateRouting() {
+      $('#survey-type').val(surveyType);
+    }
+
+	function updateName() {
+		$('.js-person-name').html(storageAPI.getHouseholdMemberByPersonId(personId)['@person'].fullName);
+	}
+
+	$(updateName);
+    $(updateRouting);
+</script>
diff --git a/_prototypes/your-household-v13/relationships-intro.html b/_prototypes/your-household-v13/relationships-intro.html
new file mode 100644
index 0000000000..0fcd3de401
--- /dev/null
+++ b/_prototypes/your-household-v13/relationships-intro.html
@@ -0,0 +1,68 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <!--<div class="container">
+        <a class="js-previous-link mars" href="../confirm-address">Previous</a>
+    </div>-->
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-xl">
+                    <div class="block">
+                        <section class="section">
+                            <h1 class="u-fs-l">Household relationships</h1>
+
+                            <p>In this section, we’ll ask you how the people who usually live in this household are related to each other.</p>
+
+                            <p>For the displayed household members, select the appropriate relationship from the options shown. The selected relationship will display at the bottom of the page for you to check.</p>
+                        </section>
+                    </div>
+                </div>
+
+                <button class="btn btn--primary btn--lg qa-btn-submit btn-submit"
+                        type="submit" name="">Continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var urlParams = new URLSearchParams(window.location.search),
+    surveyType = urlParams.get('survey'),
+    nextPage = surveyType
+      ? '../relationships/?survey=' + surveyType
+      : '../relationships';
+
+  $('.btn-submit').click(function(e) {
+    e.preventDefault(); // do not submit the form like usual
+    window.location.href = nextPage;
+  });
+
+  $(function() {
+    var oneWeekAgo = new Date();
+    oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+    var options = {year: 'numeric', month: 'long', day: 'numeric'};
+    $('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
+  });
+</script>
+
+
+
diff --git a/_prototypes/your-household-v13/relationships-person-select.html b/_prototypes/your-household-v13/relationships-person-select.html
new file mode 100644
index 0000000000..0fd511e4e8
--- /dev/null
+++ b/_prototypes/your-household-v13/relationships-person-select.html
@@ -0,0 +1,286 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+householdMembers:
+visitors:
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../summary">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsRelationships
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section" id="question-area">
+                                <div class="question">
+                                    <h1 class="question__title u-fs-l u-mb-l">
+                                        Are any of the following household
+                                        members also
+                                        <span
+                                            class="js-other-description"></span>
+                                        <span
+                                            class="js-relationship-person-is"></span>?
+                                    </h1>
+
+                                    <!--<div id="question-info"
+                                         style="display:none;"
+                                            class="panel panel&#45;&#45;simple panel&#45;&#45;info u-mb-l">
+                                        <div class="panel__body js-question-info-body">
+                                            <p class="mars">
+                                                Do not include stepchildren
+                                                or foster children here,
+                                                these will be included later
+                                            </p>
+                                        </div>
+                                    </div>-->
+
+                                    <!--<label class="label venus " id="label-address-line-1">
+                                        <div class="label__inner">
+                                            Remaining household members
+                                        </div>
+                                    </label>-->
+
+                                    <p class="u-mb-no u-fs-r--b">Remaining household
+                                        members</p>
+                                    <p>Select all that apply</p>
+
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--checkbox field--multiplechoice field--exclusive">
+                                            <fieldset id="js-member-list"
+                                                  class="u-mb-xl">
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button
+                            class="btn btn--primary btn--lg qa-btn-submit js-submit"
+                      type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="member-checkbox-select-template" class="field__item">
+        <input class="input input--checkbox js-exclusive-group js-person-control"
+               name="checkbox-answer" type="checkbox">
+        <label class="label label--inline u-fs-r js-person-name"></label>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+
+    var storageAPI = window.ONS.storage;
+
+    /**
+     * Find members that don't already have relationships with person
+     */
+    var allRelationships = storageAPI.getAllRelationships(),
+
+      params = new URLSearchParams(window.location.search),
+
+      personId = params.get('person'),
+
+      surveyType = params.get('survey'),
+
+      relationshipDescription = params.get('relationship-description'),
+
+      person,
+
+      members = storageAPI.getAllHouseholdMembers().filter(function (member) {
+        return member.type === storageAPI.KEYS.HOUSEHOLD_MEMBER_TYPE;
+      }),
+
+      remainingPersonIds = members.map(function (member) {
+        return member['@person'].id;
+      });
+
+    function createMemberListItem(person) {
+      var $nodeEl = $('#member-checkbox-select-template').clone(),
+        personId = person.id;
+
+      $nodeEl.attr('id', '');
+      $nodeEl.find('.js-person-name').html(person.fullName);
+      $nodeEl.find('.js-person-name').attr('for', personId);
+      $nodeEl.find('.js-person-control').attr('id', personId);
+      $nodeEl.find('.js-person-control').attr('value', personId);
+
+      return $nodeEl;
+    }
+
+    function removeFromList(list, val) {
+
+      function doRemove(item) {
+        var foundId = list.indexOf(item);
+
+        /**
+         * Guard
+         */
+        if (foundId === -1) {
+          console.log('Attempt to remove from list failed: ', list, val);
+          return;
+        }
+
+        list.splice(foundId, 1);
+      }
+
+      if(_.isArray(val)) {
+        $.each(val, function (i, item) {
+          doRemove(item);
+        });
+      }
+      else {
+        doRemove(val);
+      }
+    }
+
+    function updateList() {
+      if (!personId) {
+        console.log('person url parameter not found');
+        return;
+      }
+
+      if(!relationshipDescription) {
+        console.log('relationship-description url parameter not found');
+        return;
+      }
+
+      person = storageAPI.getHouseholdMemberByPersonId(personId)['@person'];
+
+      /**
+       * Remove this person from the list
+       */
+      removeFromList(remainingPersonIds, personId);
+
+      $.each(
+        allRelationships.filter(
+          storageAPI.isInRelationship.bind(null, personId)
+        ),
+        function (i, relationship) {
+          var personIsIndex = remainingPersonIds.indexOf(relationship.personIsId),
+            personToIndex = remainingPersonIds.indexOf(relationship.personToId);
+
+          if(personIsIndex !== -1) {
+            removeFromList(remainingPersonIds, relationship.personIsId);
+            return;
+          }
+
+          if(personToIndex !== -1) {
+            removeFromList(remainingPersonIds, relationship.personToId);
+            return;
+          }
+        }
+      );
+
+      $('.js-relationship-person-is').html(person.fullName);
+
+      'mother-father' === relationshipDescription && (function(){
+        $('.question__title').removeClass('u-mb-l');
+        $('#question-info').show();
+        $('.js-other-description').html('sons or daughters of');
+      }());
+
+      'unrelated' === relationshipDescription && (function(){
+        $('.js-other-description').html('unrelated to');
+        $('.js-question-info-body').html('<p>Do not include partners here, they will be included later</p>');
+        $('#question-info').show();
+      }());
+
+      $.each(
+        remainingPersonIds.map(function (personId) {
+          return storageAPI.getHouseholdMemberByPersonId(personId);
+        }
+      ), function (i, member) {
+        $('#js-member-list').append(createMemberListItem(member['@person']));
+      });
+
+      $('#js-member-list').append('<div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>');
+      $('#js-member-list').append(
+        '<div class="field__item">\n' +
+            '<input class="input input--checkbox js-exclusive-checkbox" name="heating-type" value="no central heating" id="none" type="checkbox">\n' +
+            '<label class="label label--inline u-fs-r " for="none">\n' +
+                '<span class="u-vh">,</span> None<span class="u-vh">. Selecting this will uncheck all other checkboxes</span>\n' +
+            '</label>\n' +
+            '<span class="js-exclusive-alert u-vh" role="alert" aria-live="polite" data-adjective="deselected"></span>\n' +
+        '</div>'
+      );
+    }
+
+    $('.js-submit').on('click', function(e) {
+      e.preventDefault();
+
+      var relationshipsUrl = window.location.pathname
+        .replace('relationships-person-select', 'relationships'),
+        newRelationshipsWithOtherPersonIds = [];
+
+      $('[name=checkbox-answer]:checked').each(function () {
+        var otherId = $(this).val();
+
+        /**
+         * Check if none selected
+         */
+        if (otherId === 'none') {
+          return;
+        }
+
+        newRelationshipsWithOtherPersonIds.push({
+          relationship: storageAPI.addRelationship(
+            storageAPI.TYPES.relationship(
+              relationshipDescription,
+              personId,
+              otherId
+            )
+          ),
+          otherId: otherId
+        });
+      });
+
+      /**
+       * Avoid race conditions by doing inference separately
+       */
+      $.each(newRelationshipsWithOtherPersonIds, function (i, item) {
+        storageAPI.inferRelationships(
+          item.relationship,
+          storageAPI.getHouseholdMemberByPersonId(personId),
+          storageAPI.getHouseholdMemberByPersonId(item.otherId)
+        );
+      });
+
+      window.history.replaceState(null, '', relationshipsUrl);
+
+      if(storageAPI.findNextMissingRelationship()) {
+        window.location.href = relationshipsUrl +
+          (surveyType ? '?survey=' + surveyType : '');
+      }
+      else {
+        window.location.href = '../relationships-summary-proxy/' +
+          (surveyType ? '?survey=' + surveyType : '');
+      }
+    });
+
+    $(updateList);
+</script>
diff --git a/_prototypes/your-household-v13/relationships-summary-proxy.html b/_prototypes/your-household-v13/relationships-summary-proxy.html
new file mode 100644
index 0000000000..4fcdb9a017
--- /dev/null
+++ b/_prototypes/your-household-v13/relationships-summary-proxy.html
@@ -0,0 +1,20 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+householdMembers:
+visitors:
+cdn: v1.5.0
+---
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+    var urlParams = new URLSearchParams(window.location.search),
+      surveyType = urlParams.get('survey'),
+      urlSuffix = surveyType ? '?survey=' + surveyType : '';
+
+    $(function () {
+      window.location.href = '../hub/' + urlSuffix;
+    });
+</script>
diff --git a/_prototypes/your-household-v13/relationships-summary.html b/_prototypes/your-household-v13/relationships-summary.html
new file mode 100644
index 0000000000..98689e4fdf
--- /dev/null
+++ b/_prototypes/your-household-v13/relationships-summary.html
@@ -0,0 +1,1054 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+householdMembers:
+visitors:
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../relationships">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsRelationships
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="" action="../hub">
+                    <input type="hidden" name="survey" id="survey-type" />
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <h1 class="question__title saturn">
+                                    Relationships</h1>
+
+                                <div class="panel panel--simple panel--success"
+                                     id="question-guidance-everyone-at-address-confirmation-question">
+                                    <strong class="u-mb-s">This sub section is
+                                        now complete</strong>
+                                    <ul class="mars"
+                                        style="list-style: none;padding: 0; margin-bottom: 0">
+                                        <li>You can check your answers below
+                                        </li>
+                                    </ul>
+                                </div>
+                                <br/>
+
+                                <div id="household-relationships-summary" class="u-mb-l@m"></div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+
+<div style="display:none;">
+    <div id="relationship-record-template">
+        <h3 class="accordion__title js-accordion-title u-cf icon--accordion" data-js-accordion-event-label="Total retail turnover">
+            <span class="accordion__title-text js-relationship-description"></span>
+            <button class="btn btn--secondary btn--small accordion__title-right accordion-unhide@m js-accordion-toggle u-wa--@xs" data-close-label="Hide" data-open-label="Show" aria-hidden="true">Show</button>
+        </h3>
+        <div class="accordion__body mars js-accordion-body"></div>
+    </div>
+</div>
+
+<div style="display:none;">
+    <div id="relationship-record-list-template" class="accordion js-accordion">
+        <div class="js-accordion-content js-records"></div>
+    </div>
+</div>
+
+<div style="display:none">
+    <div id="summary-record-template" class="summary__item">
+        <div class="grid">
+            <div class="grid__col col-12@xs col-6@m">
+                <div class="summary__question mars js-label"></div>
+            </div>
+            <div class="grid__col col-8@xs col-4@m">
+                <div class="summary__answer venus js-value"></div>
+            </div>
+            <div class="grid__col col-4@xs col-2@m">
+                <div class="summary__link mars js-action">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div style="display:none">
+    <div id="relatioship-details-list" class="summary">
+        <div class="summary__block js-summary-list"></div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<style>
+    .list.list--records {
+        border-top: 1px solid #ccc;
+    }
+
+    .list.list--records .list__item {
+        margin-bottom: 0;
+        padding: 1rem 0;
+        border-bottom: 1px solid #ccc;
+    }
+</style>
+
+<script>
+  var storageAPI = window.ONS.storage,
+	  utils = window.ONS.utils,
+      urlParams = new URLSearchParams(window.location.search),
+      surveyType = urlParams.get('survey');
+
+  function updateRouting() {
+    $('#survey-type').val(surveyType);
+  }
+
+  function createRecordList() {
+    var $nodeEl = $('#relationship-record-list-template').clone();
+
+    $nodeEl.attr('id', '');
+
+    return $nodeEl;
+  }
+
+  function createSummaryRecord(data) {
+    var $nodeEl = $('#summary-record-template').clone(),
+        $changeLink = $('<a href="#edit">Change</a>');
+        $changeLink.on('click', function (e) {
+          e.preventDefault();
+          window.location.href = data.changeLink;
+        });
+
+    $nodeEl.attr('id', '');
+    $nodeEl.find('.js-label').html(data.label);
+    $nodeEl.find('.js-value').html(data.value);
+    $nodeEl.find('.js-action').html($changeLink);
+
+    return $nodeEl;
+  }
+
+  function createIndividualRelationshipList() {
+    var $nodeEl = $('#relatioship-details-list').clone();
+
+    $nodeEl.attr('id', '');
+
+    return $nodeEl;
+  }
+
+  function createRecord(summary) {
+    var $nodeEl = $('#relationship-record-template').clone();
+
+    $nodeEl.find('.js-relationship-description').html(summary);
+
+    return $nodeEl;
+  }
+
+  function updateRecords() {
+    var allRelationships = storageAPI.getAllRelationships(),
+      relationshipIdsToExplain = allRelationships
+        .filter(function(relationship) { return !relationship.inferred; })
+        .map(function(relationship) { return relationship.id; }),
+      lines = [],
+      relationshipView = [],
+      recordList = createRecordList();
+
+    $('#household-relationships-summary').html();
+
+    console.log('To explain: ', [].concat(relationshipIdsToExplain));
+
+    /**
+     * Relationships sorted by household member entry order
+     */
+    $.each(storageAPI.getAllHouseholdMembers().filter(storageAPI.isHouseholdMember),
+      function (i, member) {
+      var memberRelationships = allRelationships
+        .filter(function(relationship) {
+          return storageAPI.isInRelationship(
+            member['@person'].id,
+            relationship
+          );
+        });
+
+      /**
+       * Guard
+       */
+      if (!memberRelationships.length) {
+        return;
+      }
+
+      /**
+       * For each member relationship, - currently not strictly run in order
+       * 1. Find all partner-type relationships
+       * 2. Find all children with partner(s) if found
+       * 3. Find all children as a single parent
+       * 4. Find all other relationships
+       */
+      $.each(memberRelationships, function (i, relationship) {
+
+        /**
+         * Guard
+         * Don't do anything if relationship is explained
+         */
+        if (relationshipIdsToExplain.indexOf(relationship.id) === -1) {
+          return;
+        }
+
+        var relationshipType = storageAPI
+            .relationshipDescriptionMap[relationship.personIsDescription].type,
+
+          relationshipTypeId = relationshipType.id;
+
+        var summaryLines = summaryStrategies[
+          relationshipTypesToSummaryStrategyMap[relationshipTypeId]
+          ](relationship, member['@person']);
+
+        console.log('Summary lines: ', summaryLines);
+
+        lines = [].concat(lines, summaryLines.lines);
+        relationshipView = [].concat(relationshipView, summaryLines);
+
+        $.each(summaryLines.relationshipsExplained,
+          function (i, relationshipExplained) {
+            utils.removeFromList(relationshipIdsToExplain, relationshipExplained.id);
+          });
+      });
+    });
+
+    console.log('Explained: ', relationshipIdsToExplain);
+
+    var recordsEl = recordList.find('.js-records');
+
+    $.each(relationshipView, function(i, summary) {
+      var recordEl = createRecord(summary.lines.join(',<br />'));
+      var accordionBody = recordEl.find('.js-accordion-body');
+      var relationshipList = createIndividualRelationshipList();
+
+      $.each(summary.relationshipsExplained, function(t, relationship) {
+        var USER_HOUSEHOLD_MEMBER_ID = storageAPI.IDS.USER_HOUSEHOLD_MEMBER_ID,
+          personIs =
+            storageAPI.getHouseholdMemberByPersonId(relationship.personIsId)['@person'],
+          personTo =
+            storageAPI.getHouseholdMemberByPersonId(relationship.personToId)['@person'];
+
+        var label = relationship.personToId === USER_HOUSEHOLD_MEMBER_ID
+          ? (personIs.fullName + ' is your ...')
+          : ('Thinking of ' + personTo.fullName + ', <br />' +
+            personIs.fullName + ' is their ...');
+
+        var summaryRecordEl = createSummaryRecord({
+          label: label,
+          value: storageAPI.relationshipDescriptionMap[relationship.personIsDescription].sentanceLabel,
+          changeLink: '../relationships/?edit=' + relationship.id
+        });
+
+        relationshipList.find('.js-summary-list').append(summaryRecordEl);
+      });
+
+      recordsEl.append(recordEl);
+      accordionBody.append(relationshipList);
+    });
+
+    $('#household-relationships-summary').append(recordList);
+  }
+
+  function retrieveRelationshipInfo(relationship) {
+    var personIs = storageAPI
+        .getHouseholdMemberByPersonId(relationship.personIsId)['@person'],
+      personTo = storageAPI
+        .getHouseholdMemberByPersonId(relationship.personToId)['@person'],
+      relationshipDescription = storageAPI
+        .relationshipDescriptionMap[relationship.personIsDescription],
+      relationshipType = relationshipDescription.type,
+      relationshipTypeId = relationshipType.id;
+
+    return {
+      '@personIs': personIs,
+      '@personTo': personTo,
+      'relationshipDescription': relationshipDescription,
+      'relationshipType': relationshipType,
+      'relationshipTypeId': relationshipTypeId
+    };
+  }
+
+  function partnershipSummary(relationship) {
+    var relationshipInfo = retrieveRelationshipInfo(relationship);
+
+    return {
+      relationshipsExplained: [relationship],
+      lines: [
+        storageAPI.relationshipSummaryTemplates['partnership'](
+          relationshipInfo['@personIs'],
+          relationshipInfo['@personTo'],
+          relationshipInfo['relationshipDescription'].summaryAdjective
+        )
+      ]
+    };
+  }
+
+  function groupSummary(relationship) {
+    var relationshipInfo = retrieveRelationshipInfo(relationship),
+      relationshipsExplained = [],
+      lines = [],
+      mutualGroups = groupSummary.findMutualOf(relationshipInfo),
+      manyToManyGroups = groupSummary.findManyToManyWith(relationshipInfo);
+
+    if(mutualGroups.people && mutualGroups.people.length) {
+      lines.push(storageAPI.relationshipSummaryTemplates['allMutual'](
+        mutualGroups.people.map(function (personId) {
+          return storageAPI.getHouseholdMemberByPersonId(personId)['@person'];
+        }),
+        relationshipInfo['relationshipDescription'].summaryAdjective
+      ));
+
+      relationshipsExplained = relationshipsExplained
+        .concat(mutualGroups.relationshipsExplained);
+    }
+    else if(manyToManyGroups.groups && manyToManyGroups.groups.length) {
+      $.each(manyToManyGroups.groups, function (i, group) {
+        lines.push(storageAPI.relationshipSummaryTemplates['manyToMany'](
+          group.personRelatedGroup.map(function(personId) {
+            return storageAPI.getHouseholdMemberByPersonId(personId)['@person'];
+          }),
+          group.otherPeopleGroup.map(function(personId) {
+            return storageAPI.getHouseholdMemberByPersonId(personId)['@person'];
+          }),
+          relationshipInfo['relationshipDescription'].summaryAdjective
+        ));
+      });
+
+      relationshipsExplained = relationshipsExplained
+        .concat(manyToManyGroups.relationshipsExplained);
+    } else {
+
+      /**
+       * Needs rework for many to many relationships
+       */
+      relationshipsExplained = [relationship];
+
+      lines.push(storageAPI.relationshipSummaryTemplates['allMutual'](
+        [
+          relationshipInfo['@personIs'],
+          relationshipInfo['@personTo']
+        ],
+        relationshipInfo['relationshipDescription'].summaryAdjective
+      ));
+    }
+
+    console.log('summaries: ', lines);
+    console.log('relationshipsExplained: ', relationshipsExplained);
+    console.log('mutual: ', mutualGroups);
+    console.log('manyToManyGroups: ', manyToManyGroups);
+    console.log('=====');
+
+    /**
+     * 1. Find all mutual relationships
+     * / Filter out inferred relationships
+     *
+     * / Find all filtered relationships with personIs
+     * - For each other person in relationship find relationships with same
+     * type and other people as personIs (Defining group scope for summary)
+     * - Remove and store the differences between personIs relationships and
+     * other person 'in scope' relationships
+     *
+     *
+     * 2. Find all group to group relationships
+     * - With remaining relationships...
+     *
+     * - For each other person in remaining relationship find relationships with
+     * the same type (People can be out of scope of mutual relationships, the
+     * only thing in common is the relationship type).
+     * - For each new relationship found, check whether other people in
+     * remaining relationships share the same type of relationship to new
+     * person.
+     *
+     *       Are unrelated to
+     * dave  <------------->  Jon
+     * Emily <------------->  Mark
+     * James <------------->  Emma
+     *
+     * Also, bi-directional arrows must cross for all members on opposing
+     * groups.
+     *
+     */
+
+
+    /**
+     * Could default to writing out relationship manually?
+     */
+
+    return {
+      relationshipsExplained: relationshipsExplained,
+      lines: lines
+    }
+  }
+
+  function getMemberRelationshipModelsByType(relationshipType) {
+    return storageAPI.getAllHouseholdMembers().filter(storageAPI.isHouseholdMember)
+      .map(function (member) {
+        var personId = member['@person'].id;
+
+        return {
+          personId: personId,
+          relationships:
+            storageAPI.getAllManualRelationships()
+              .filter(storageAPI.isRelationshipType.bind(null, relationshipType))
+              .filter(storageAPI.isInRelationship.bind(null, personId))
+        }
+      })
+  }
+
+  /**
+   * Mutually exclusive relationship groups in priority order
+   */
+  var exclusiveGroups = {
+    'sibling': [],
+    'step-brother-sister': [],
+    'other-relation': [],
+    'unrelated': []
+  };
+
+  var explainedExclusiveGroups = {
+    'sibling': [],
+    'step-brother-sister': [],
+    'other-relation': [],
+    'unrelated': []
+  };
+
+  var explainedManyToManyGroups = [];
+
+  groupSummary.findMutualOf = function(relationshipInfo) {
+    var groupModelPeople = [],
+      personIsId = relationshipInfo['@personIs'].id,
+      personToId = relationshipInfo['@personTo'].id,
+      mutualGroups = groupSummary.mutuallyExclusiveGroupsViewModel(),
+      relationshipsExplained = [],
+      relationshipsIdsExplained = [];
+
+    $.each(mutualGroups, function(i, groupsByType) {
+      var found = _.find(groupsByType, function (group) {
+        return group.indexOf(personIsId) !== -1 &&
+          group.indexOf(personToId) !== -1;
+      });
+
+      if(found && !(explainedExclusiveGroups[i]
+        .indexOf(groupsByType.indexOf(found)) !== -1)
+      ) {
+        explainedExclusiveGroups[i].push(groupsByType.indexOf(found));
+        groupModelPeople = found;
+      }
+    });
+
+    $.each(groupModelPeople, function (i, person1Id) {
+      $.each(groupModelPeople, function (o, person2Id) {
+        var relationship = storageAPI.getRelationshipOf(person1Id, person2Id);
+
+        /**
+         * Guard
+         */
+        if (i === o || !relationship ||
+          relationshipsIdsExplained.indexOf(relationship.id) !== -1) {
+          return;
+        }
+
+        relationshipsIdsExplained.push(relationship.id);
+        relationshipsExplained = relationshipsExplained.concat(relationship);
+      });
+    });
+
+    return {
+      people: groupModelPeople,
+      relationshipsExplained: relationshipsExplained
+    };
+  };
+
+  groupSummary.mutuallyExclusiveGroupsViewModel = function () {
+    if (groupSummary.allMutuallyExclusiveGroups) {
+      return groupSummary.allMutuallyExclusiveGroups;
+    }
+
+    $.each(exclusiveGroups, function (relationshipType, group) {
+      var peopleAlreadyAllocated = _.uniq(_.flatten(_.keys(exclusiveGroups)
+        .map(function(k) {
+          return exclusiveGroups[k];
+        })));
+
+      /**
+       * Find all sibling group models first
+       */
+      var memberRelationshipsModels =
+        getMemberRelationshipModelsByType(relationshipType);
+
+      var memberPersonIdGroups = memberRelationshipsModels.map(function (model){
+        var people = model.relationships.map(
+          storageAPI.getOtherPersonIdFromRelationship.bind(null, model.personId)
+        );
+
+        if(people.length) {
+          people.push(model.personId);
+        }
+
+        return people;
+      });
+
+      /**
+       * Remove members already found in other mutual groups
+       */
+      var removedDuplicates = memberPersonIdGroups.map(function (group) {
+        var nonDuplicates = group.filter(function (personId) {
+          return peopleAlreadyAllocated.indexOf(personId) === -1;
+        });
+
+        return nonDuplicates;
+      });
+
+      /**
+       * Can only be one unrelated mutual group
+       */
+      if(relationshipType === 'unrelated') {
+        removedDuplicates = [_.intersection.apply(null, removedDuplicates)];
+      }
+
+      var uniqueGroupsByType = removedDuplicates
+        .reduce(function (accum, currentGroup) {
+          var matchFound = false;
+
+          $.each(accum, function (i, group) {
+            if(!_.difference(currentGroup, group).length) {
+              matchFound = true;
+            }
+          });
+
+          if(!accum.length || !matchFound) {
+            accum.push(currentGroup);
+          }
+
+          return accum;
+        }, []);
+
+      exclusiveGroups[relationshipType] = uniqueGroupsByType;
+    });
+
+    groupSummary.allMutuallyExclusiveGroups = exclusiveGroups;
+
+    return exclusiveGroups;
+  };
+
+  function isPersonInGroup(list, personTarget) {
+    return _.find(list, function (personId) {
+      return personId === personTarget;
+    });
+  }
+
+  groupSummary.findManyToManyWith = function(relationshipInfo) {
+    var personIsId = relationshipInfo['@personIs'].id,
+      personToId = relationshipInfo['@personTo'].id,
+
+      personIsGroups = groupSummary.getGroupsOf(personIsId, personToId),
+      personToGroups = groupSummary.getGroupsOf(personToId, personIsId),
+
+      relationshipsExplained = [],
+      /*relationshipsIdsExplained = []*/
+
+      /*[{
+          personRelatedGroup: [<people>],
+          otherPeopleGroup: [<people>]
+      }]*/
+      groups = [];
+
+    console.log('personIsGroups: ', personIsGroups);
+    console.log('personToGroups: ', personToGroups);
+
+    /**
+     * Check people in relationship aren't already found in a many to many
+     * relationship
+     */
+    if(_.find(explainedManyToManyGroups, function (group) {
+      return (
+        isPersonInGroup(group.personRelatedGroup, personIsId) &&
+        isPersonInGroup(group.otherPeopleGroup, personToId)
+        ) || (
+        isPersonInGroup(group.personRelatedGroup, personToId) &&
+        isPersonInGroup(group.otherPeopleGroup, personIsId)
+      );
+    })) {
+      return {
+        groups: groups,
+        relationshipsExplained: relationshipsExplained
+      };
+    }
+
+    groups = groups.concat(
+      manyToManyViewModels(relationshipInfo, personToGroups).groups,
+      manyToManyViewModels(relationshipInfo, personIsGroups).groups
+    );
+
+    /**
+     * Explain relationships
+     */
+    $.each(groups, function (i, group) {
+      $.each(group.personRelatedGroup, function (i, person1Id) {
+        $.each(group.otherPeopleGroup, function (o, person2Id) {
+          relationshipsExplained.push(storageAPI.getRelationshipOf(person1Id, person2Id));
+        });
+      });
+    });
+
+    return {
+      groups: groups,
+      relationshipsExplained: relationshipsExplained
+    };
+  };
+
+  /**
+   * Create many to many models
+   */
+  function manyToManyViewModels(relationshipInfo, personGroups) {
+    var groups = [];
+
+    $.each(personGroups, function (i, personGroup) {
+      $.each(personGroup, function (o, group) {
+        var personGroupByRelationship = group.map(function (personId) {
+            return storageAPI.getAllManualRelationships()
+              .filter(storageAPI.isInRelationship.bind(null, personId))
+              .filter(storageAPI.isRelationshipType
+                .bind(null, relationshipInfo.relationshipTypeId))
+              .map(storageAPI.getOtherPersonIdFromRelationship
+                .bind(null, personId));
+          }),
+
+          /**
+           * Smallest indifferent group
+           */
+          otherPeopleGroup = _.intersection
+            .apply(null, personGroupByRelationship),
+
+          personRelatedGroup = group,
+
+          model;
+
+        if(personRelatedGroup.length && otherPeopleGroup.length) {
+
+          /**
+           * Filter people on left side that have already been explained in
+           * many to many groups
+           * Refine otherPeopleGroup
+           */
+          $.each(explainedManyToManyGroups, function (t, explainedGroup) {
+
+            if(explainedGroup.relationshipTypeId ===
+              relationshipInfo.relationshipTypeId
+            ) {
+
+              /**
+               * If there is a match to the same group of other people in
+               * relationship
+               */
+              if(!_.difference(
+                otherPeopleGroup,
+                explainedGroup.otherPeopleGroup
+              ).length) {
+
+                /**
+                 * Only include people who haven't already been explained to
+                 * this otherPeopleGroup
+                 */
+                personRelatedGroup = _.difference(
+                  personRelatedGroup,
+                  explainedGroup.personRelatedGroup
+                );
+              }
+            }
+          });
+
+          if(!personRelatedGroup.length) {
+            return;
+          }
+
+          model = {
+            relationshipTypeId: relationshipInfo.relationshipTypeId,
+            personRelatedGroup: personRelatedGroup,
+            otherPeopleGroup: otherPeopleGroup
+          };
+
+          groups.push(model);
+          explainedManyToManyGroups.push(model);
+        }
+
+        console.log('personGroupByRelationship', personGroupByRelationship);
+        console.log('personRelatedGroup', personRelatedGroup);
+        console.log('otherPeopleGroup', otherPeopleGroup);
+      });
+    });
+
+    return {
+      groups: groups
+    };
+  }
+
+  groupSummary.getGroupsOf = function(person1Id, person2Id) {
+    var personGroups = [],
+      mutualGroups = groupSummary.mutuallyExclusiveGroupsViewModel();
+
+    /**
+     * TODO - Should this be grouped with other family?
+     * Find other double member groups to add to personIsGroups
+     */
+    var personFamilySingleGroups = storageAPI.getAllManualRelationships()
+      .filter(storageAPI.isInRelationship.bind(null, person1Id))
+      .filter(storageAPI.isRelationshipType.bind(null, [
+        'spouse', 'partner', 'step-child-parent', 'grandchild-grandparent'
+      ]))
+      .map(function (relationship) {
+        return [
+          storageAPI.getOtherPersonIdFromRelationship(person1Id, relationship),
+          person1Id
+        ];
+      });
+
+    /**
+     * Find mutual group that has personIs only and not personTo in relationship
+     * and isn't an unrelated mutual group
+     */
+    var personMutualGroup = _.find(mutualGroups,
+      function (groupsByType, gTypeKey) {
+        if(gTypeKey === 'unrelated') {
+          return false;
+        }
+
+        return _.find(groupsByType, function (group) {
+          return group.indexOf(person1Id) !== -1 &&
+            group.indexOf(person2Id) === -1;
+        })
+      });
+
+    /**
+     * TODO - Add family as group
+     * Hack - Refine sibling mutual groups with shared parents and inferred
+     * sibling relationships from familySummary viewModels
+     *
+     * Find all family with person1Id
+     * Find sibling mutual group with person1Id
+     *
+     * If person1Id has both, detect whether other siblings in group have the
+     * same parent(s).
+     *   If mutual siblings shares 2 parents, replace mutual group with family.
+     *   If mutual siblings share 1 parent, attempt to break mutual group into
+     *     siblings with two parent groups
+     *   else
+     *     Break into 1 parent to children group(s)
+     *
+     * else - theres is no conflict, add as additional group
+     */
+
+    personFamilySingleGroups.length && personGroups.push(personFamilySingleGroups);
+    personMutualGroup && personGroups.push(personMutualGroup);
+
+    return personGroups;
+  };
+
+  function familySingleSummary(relationship) {
+    var relationshipInfo = retrieveRelationshipInfo(relationship);
+
+    return {
+      relationshipsExplained: [relationship],
+      lines: [
+        storageAPI.relationshipSummaryTemplates['oneFamilyMemberToMany'](
+          relationshipInfo['@personIs'],
+          [
+            relationshipInfo['@personTo']
+          ],
+          relationshipInfo['relationshipDescription'].summaryAdjective
+        )
+      ]
+    }
+  }
+
+  function familySummary(relationship) {
+    var relationshipInfo = retrieveRelationshipInfo(relationship),
+
+      relationshipsExplained =  [],
+
+      lines = [],
+
+      parent = storageAPI.getHouseholdMemberByPersonId(
+        storageAPI.getParentIdFromRelationship(relationship)
+      )['@person'],
+
+      allRelationships = storageAPI.getAllRelationships(),
+
+      memberRelationships = allRelationships.filter(function(relationship) {
+        return storageAPI.isInRelationship(
+          parent.id,
+          relationship
+        );
+      }),
+
+      personIsChildrenRelationships = memberRelationships
+        .filter(storageAPI.isAParentInRelationship.bind(null, parent.id)),
+
+      personIsChildrenIds = personIsChildrenRelationships
+        .map(function (relationship) {
+          return storageAPI.getChildIdFromRelationship(relationship);
+        }),
+
+      /**
+       * Find all children from personIs relationships
+       */
+      personIsChildren = personIsChildrenIds.map(function (id) {
+        return storageAPI.getHouseholdMemberByPersonId(id)['@person'];
+      }),
+
+      childrenIdsToExplain = $.merge([], personIsChildrenIds),
+
+      otherSharedParentRelationships = allRelationships
+        .filter(
+          storageAPI.areAnyChildrenInRelationshipNotParent.bind(
+            null, personIsChildrenIds, parent.id
+          )
+        )
+        .filter(function (relationship) {
+          var parentIdFromRelationship = storageAPI
+            .getParentIdFromRelationship(relationship);
+
+          /**
+           * Guard
+           * Check if shared parent relationship has already been explained before creating a new viewModel
+           */
+          var existing = _.find(familySummary.sharedParentsViewModelHistory,
+            function (vModel) {
+
+            return _.difference(
+              [vModel.parent1, vModel.parent2],
+              [parentIdFromRelationship, parent.id]
+            ).length === 0;
+          });
+
+          return !existing;
+        }),
+
+      familyViewModelProduct = twoParentFamilyViewModelItems(
+        otherSharedParentRelationships,
+        parent
+      ),
+
+      /**
+       * Shared children relationships with parent
+       * Example: [
+       *    {
+       *        parent1: 1
+       *        parent2: 2,
+       *        children: []
+       *    }
+       * ]
+       */
+      viewModel = familyViewModelProduct.viewModel,
+      viewModelChildrenIdsExplained = familyViewModelProduct.childIdsExplained;
+
+    /**
+     * Remove children explained in shared parent relationships
+     */
+    utils.removeFromList(childrenIdsToExplain, viewModelChildrenIdsExplained);
+
+    /**
+     * Add extra relationships explained in view-model to list
+     */
+    relationshipsExplained = relationshipsExplained
+      .concat(familyViewModelProduct.relationshipsExplained);
+
+    /**
+     * Add parent relationships explained from viewModel
+     * (Might belong in the above exported relationshipsExplained)
+     */
+    var parentRelationshipsExplained = storageAPI.getRelationshipsWithPersonIds(
+      personIsChildrenRelationships,
+      allFamilyViewModelChildren(viewModel)
+    );
+
+    if (parentRelationshipsExplained) {
+      relationshipsExplained = relationshipsExplained
+        .concat(parentRelationshipsExplained);
+    }
+
+    /**
+     * Create lines for two parents of (shared parenthood)
+     */
+    $.each(viewModel, function (i, line) {
+      lines.push(storageAPI.relationshipSummaryTemplates['twoFamilyMembersToMany'](
+        parent,
+        storageAPI.getHouseholdMemberByPersonId(line.parent2)['@person'],
+        line.children.map(function(child) { return child; }),
+        storageAPI.relationshipDescriptionMap['mother-father'].summaryAdjective
+      ));
+    });
+
+    /**
+     * If there are children remaining without a shared parent relationship
+     * create a line for one parent of
+     */
+    if(childrenIdsToExplain.length) {
+
+      (function () {
+
+        /**
+         * Check children haven't already been explained in sharedParentHistory
+         */
+        var explainedChildrenFromHistory = allFamilyViewModelChildren(
+            familySummary.sharedParentsViewModelHistory
+          ),
+
+          remainingChildrenIds = childrenIdsToExplain
+            .filter(function (id) {
+              return explainedChildrenFromHistory.indexOf(id) === -1;
+            }),
+
+          remainingChildrenNames = remainingChildrenIds.map(function (id) {
+            return personIsChildren[personIsChildrenIds.indexOf(id)];
+          }),
+
+          /**
+           * Get associated relationships with parent for remaining relationships
+           */
+          remainingChildrenRelationships = storageAPI.getRelationshipsWithPersonIds(
+            personIsChildrenRelationships,
+            remainingChildrenIds
+          );
+
+        lines.push(storageAPI.relationshipSummaryTemplates['oneFamilyMemberToMany'](
+          parent,
+          remainingChildrenNames,
+
+          /**
+           * Force parent descripion for more efficient summary
+           */
+          storageAPI.relationshipDescriptionMap['mother-father'].summaryAdjective
+        ));
+
+        relationshipsExplained = relationshipsExplained
+          .concat(remainingChildrenRelationships);
+
+      }());
+    }
+
+    return {
+      relationshipsExplained: relationshipsExplained,
+      lines: lines
+    };
+  }
+
+  /**
+   * Cache of shared-parent view-models
+   */
+  familySummary.sharedParentsViewModelHistory = [];
+
+
+  function allFamilyViewModelChildren(viewModel) {
+    return _.uniq(
+      _.flatten(viewModel.map(function(vModel) {
+        return vModel.children.map(function (child) { return child.id; });
+      }))
+    );
+  }
+
+  /**
+   * Create view-model items to render lines of summaries
+   */
+  function twoParentFamilyViewModelItems(relationships, withPerson) {
+    var childIdsExplained = [],
+      relationshipsExplained = [],
+      viewModel = [];
+
+    $.each(relationships,
+      function (i, relationship) {
+        var parentIdFromRelationship = storageAPI
+          .getParentIdFromRelationship(relationship),
+          childId;
+
+        /**
+         * Check if parentId already exists in viewModel
+         * If if does, this becomes the item, else create new item
+         */
+        var item = _.find(viewModel, function (line) {
+          return line.parent2 === parentIdFromRelationship;
+        });
+
+        if(!item) {
+          item = {
+            parent1: withPerson.id,
+            parent2: parentIdFromRelationship,
+            children: []
+          };
+
+          viewModel.push(item);
+          familySummary.sharedParentsViewModelHistory.push(item);
+        }
+
+        childId = storageAPI.getChildIdFromRelationship(relationship);
+
+        /**
+         * Add child to viewModel
+         */
+        item.children
+          .push(storageAPI.getHouseholdMemberByPersonId(childId)['@person']);
+
+        childIdsExplained.push(childId);
+        relationshipsExplained.push(relationship);
+      }
+    );
+
+    return {
+      viewModel: viewModel,
+      childIdsExplained: childIdsExplained,
+      relationshipsExplained: relationshipsExplained
+    };
+  }
+
+
+  var relationshipTypesToSummaryStrategyMap = {
+    'spouse':                   'partnership',
+    'partner':                  'partnership',
+    'child-parent':             'family',
+    'sibling':                  'group',
+    'step-brother-sister':      'group',
+    'other-relation':           'group',
+    'unrelated':                'group',
+    'step-child-parent':        'family-single',
+    'grandchild-grandparent':   'family-single'
+  };
+
+  /**
+   * Strategy interface:
+   * Parameters: relationship
+   * Returns: {
+   *   relationshipsExplained: [<relationship>],
+   *   summarylines: [<string (HTML)>]
+   * }
+   */
+  var summaryStrategies = {
+    'partnership': partnershipSummary,
+    'family': familySummary,
+    'group': groupSummary,
+    'family-single': familySingleSummary
+  };
+
+  $(updateRecords);
+  $(updateRouting);
+</script>
diff --git a/_prototypes/your-household-v13/relationships.html b/_prototypes/your-household-v13/relationships.html
new file mode 100644
index 0000000000..ebff17f54b
--- /dev/null
+++ b/_prototypes/your-household-v13/relationships.html
@@ -0,0 +1,598 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+householdMembers:
+visitors:
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../summary">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsRelationships
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section" id="question-area">
+                                <div class="question">
+                                    <h1 class="question__title u-fs-l">
+                                        <span class="js-relationship-person-is-relationship-description">...</span>
+                                    </h1>
+                                    <p class="question__description">
+                                        Complete the sentence by selecting
+                                        the appropriate relationship.
+                                    </p>
+
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice u-mb-l">
+                                            <fieldset class="grid">
+                                                <div class="grid__col col-10@m">
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="husband-wife"
+                                                               value="husband-wife"/>
+                                                        <label class="label label--inline u-width-fill venus"
+                                                               for="husband-wife">Husband
+                                                            or wife</label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="same-sex-partner"
+                                                               value="same-sex-partner"/>
+                                                        <label class="label label--inline venus"
+                                                               for="same-sex-partner">
+                                                            Legally registered civil partner
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="partner"
+                                                               value="partner"/>
+                                                        <label class="label label--inline venus"
+                                                               for="partner">
+                                                            Partner
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="son-daughter"
+                                                               value="son-daughter"/>
+                                                        <label class="label label--inline venus"
+                                                               for="son-daughter">
+                                                            Son or daughter
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="step-child"
+                                                               value="step-child"/>
+                                                        <label class="label label--inline venus"
+                                                               for="step-child">
+                                                            Stepchild
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="brother-sister"
+                                                               value="brother-sister"/>
+                                                        <label class="label label--inline venus"
+                                                               for="brother-sister">
+                                                            Brother or sister
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="step-brother-sister"
+                                                               value="step-brother-sister"/>
+                                                        <label class="label label--inline venus"
+                                                               for="step-brother-sister">
+                                                            Stepbrother or
+                                                            stepsister
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="mother-father"
+                                                               value="mother-father"/>
+                                                        <label class="label label--inline venus"
+                                                               for="mother-father">
+                                                            Mother or father
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="step-mother-father"
+                                                               value="step-mother-father"/>
+                                                        <label class="label label--inline venus"
+                                                               for="step-mother-father">
+                                                            Stepmother or
+                                                            stepfather
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input--radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="grandchild"
+                                                               value="grandchild"/>
+                                                        <label class="label label--inline venus"
+                                                               for="grandchild">
+                                                            Grandchild
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input&#45;&#45;radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="grandparent"
+                                                               value="grandparent"/>
+                                                        <label class="label label&#45;&#45;inline venus"
+                                                               for="grandparent">
+                                                            Grandparent
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input&#45;&#45;radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="other-relation"
+                                                               value="other-relation"/>
+                                                        <label class="label label&#45;&#45;inline venus"
+                                                               for="other-relation">
+                                                            Other relation
+                                                        </label>
+                                                    </div>
+                                                    <div class="field__item js-focusable-box">
+                                                        <input class="input input&#45;&#45;radio js-focusable"
+                                                               type="radio"
+                                                               name="relationship"
+                                                               id="unrelated"
+                                                               value="unrelated"/>
+                                                        <label class="label label&#45;&#45;inline venus"
+                                                               for="unrelated">
+                                                            <strong
+                                                                    class="u-fs-r">
+                                                                Unrelated</strong>
+                                                            <p
+                                                                    class="u-fs-s u-db u-mb-no">Including foster child</p>
+                                                        </label>
+                                                    </div>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                        <fieldset class="grid">
+                                            <div class="grid__col col-10@m">
+                                                <div class="js-relationship-answer-feedback u-mb-xl answer-feedback"></div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<style>
+    .field--multiplechoice .field__item {
+        margin-right: 0;
+        width: 100%;
+        min-width: 0;
+        vertical-align: top;
+    }
+
+    .label .label--negative {
+        margin-left: -1.9rem;
+    }
+
+    .u-width-fill {
+        width: 100%;
+        min-width: 0;
+    }
+
+    .answer-feedback {
+        margin-right: 1rem;
+        padding-top: 1rem;
+        padding-bottom: 1rem;
+        border-top: 1px solid #999;
+        border-bottom: 1px solid #999;
+    }
+</style>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    personIs,
+    personTo,
+
+    urlParams = new URLSearchParams(window.location.search),
+    editRelationshipId = urlParams.get('edit'),
+    redirect = urlParams.get('redirect'),
+    editRelationshipFound = null,
+
+    surveyType = urlParams.get('survey'),
+    nextPageSurveyRouting = surveyType ? '&survey=' + surveyType : '';
+
+  function updateAnswer(missingRelationship, relationshipDescription) {
+    var personIs = missingRelationship.personIs,
+      personTo = missingRelationship.personTo;
+
+    var personToIsMe = personTo['@person'].id ===
+      storageAPI.IDS.USER_HOUSEHOLD_MEMBER_ID;
+
+    var isNotFamilyDescription = relationshipDescription &&
+      ['unrelated'].indexOf(
+        relationshipDescription.type.id
+      ) !== -1;
+
+    var gap2 = isNotFamilyDescription
+      ? " is "
+      : (personToIsMe
+          ? " is your"
+          : " is " + personTo['@person'].fullName +
+          window.ONS.utils.trailingNameS(personTo['@person'].fullName)
+      );
+
+    var gap3 = " to " + (personToIsMe ? ' you' : personTo['@person'].fullName);
+
+    $('.js-relationship-answer-feedback').html(
+      personIs['@person'].fullName +
+
+      gap2 +
+
+      '<strong>' +
+        (relationshipDescription &&
+          (' ' + relationshipDescription.sentanceLabel) ||
+          " ...") +
+      '</strong>' +
+
+      /**
+       * Conditionally show if not family description
+       */
+      (isNotFamilyDescription ? gap3 : '')
+    );
+  }
+
+  function updateQuestion(missingRelationship, relationshipDescription) {
+    var personIs = missingRelationship.personIs,
+      personTo = missingRelationship.personTo;
+
+    var isNotFamilyDescription = relationshipDescription &&
+      ['unrelated'].indexOf(
+        relationshipDescription.type.id
+      ) !== -1;
+
+    var personToIsMe = personTo['@person'].id ===
+        storageAPI.IDS.USER_HOUSEHOLD_MEMBER_ID;
+    
+    var gap1 = "Thinking about " + personTo['@person'].fullName + ", <br />";
+
+    var gap2 = isNotFamilyDescription
+      ? " is "
+      : (personToIsMe ? " is your" : " is their");
+
+    var gap3 = " to " + (personToIsMe ? ' you' : personTo['@person'].fullName);
+
+    $('.js-relationship-person-is-relationship-description').html(
+      
+      /**
+       * Conditionally show if question is not about me
+       */
+      (!personToIsMe ? gap1 : '') +
+
+      personIs['@person'].fullName + gap2 +
+      " <span class='highlight'>" +
+        (relationshipDescription && relationshipDescription.sentanceLabel ||
+          "...") +
+      "</span>" +
+
+      /**
+       * Conditionally show if not family description
+       */
+      (isNotFamilyDescription ? gap3 : '')
+    );
+  }
+
+  function getChosenItem() {
+    var val = $('[name="relationship"]:checked').val();
+
+    return {
+      val: val,
+      description: storageAPI.relationshipDescriptionMap[val]
+    };
+  }
+
+  /**
+   * Edit relationship page setup
+   */
+  function journeyEditRelationship() {
+    editRelationshipFound = storageAPI.getAllRelationships()
+      .filter(function(relationship) {
+        return relationship.id + '' === editRelationshipId;
+      })[0];
+
+    if (editRelationshipFound) {
+      personIs = storageAPI
+        .getHouseholdMemberByPersonId(editRelationshipFound.personIsId);
+      personTo = storageAPI
+        .getHouseholdMemberByPersonId(editRelationshipFound.personToId);
+
+      updateQuestion({
+        personIs: personIs,
+        personTo: personTo
+      });
+
+      updateAnswer({
+        personIs: personIs,
+        personTo: personTo
+      });
+
+      $('.qa-btn-submit')
+        .on('click', editSubmit_handler.bind(null, editRelationshipId));
+    }
+    else {
+      $('#question-area')
+        .html('<h1 class="u-fs-l">Relationship not found</h1>');
+    }
+  }
+
+  function editSubmit_handler(relationshipId, e) {
+    e.preventDefault();
+
+    var chosenItem = getChosenItem(),
+      relationshipDescriptionVal = chosenItem.val,
+      relationshipDescription = chosenItem.description,
+      aRelationshipPreviouslyInferredByThis = false;
+
+    if (!relationshipDescription) {
+      throw Error('Relationship description not found: ', relationshipDescription);
+    }
+
+    storageAPI.editRelationship(relationshipId,
+      storageAPI.TYPES.relationship(
+        relationshipDescriptionVal,
+        editRelationshipFound.personIsId,
+        editRelationshipFound.personToId
+      )
+    );
+
+    /**
+     * Were there any relationships created by inference when
+     * previously creating this relationship
+     */
+    $.each(storageAPI.getAllRelationships().filter(storageAPI.isRelationshipInferred),
+      function(i, relationship) {
+        var isInferredByThis = !!_.find(relationship.inferredBy, function(id) {
+          return id+'' === relationshipId+'';
+        });
+
+        if(isInferredByThis) {
+          storageAPI.deleteRelationship(relationship);
+          aRelationshipPreviouslyInferredByThis = true;
+        }
+      });
+
+    if(aRelationshipPreviouslyInferredByThis) {
+      dynamicRouting();
+    }
+    else {
+      window.location.href = '../relationships-summary-proxy/?noop=1' +
+        nextPageSurveyRouting;
+    }
+  }
+
+  /**
+   * Create relationship page setup
+   */
+  function journeyCreateNewRelationship() {
+    var missingRelationship = storageAPI.findNextMissingRelationship();
+
+    if (missingRelationship) {
+      personIs = missingRelationship.personTo;
+      personTo = missingRelationship.personIs;
+
+      updateQuestion({
+        personIs: personIs,
+        personTo: personTo
+      });
+
+      updateAnswer({
+        personIs: personIs,
+        personTo: personTo
+      });
+
+      $('.qa-btn-submit').on('click', missingSubmit_handler);
+    }
+    else {
+      $('#question-area')
+        .html('<h1 class="u-fs-l">No missing relationships found</h1>');
+      $('.qa-btn-submit').on('click', function(e) {
+        e.preventDefault();
+
+        window.location.href = '../relationships-summary-proxy/?noop=1' + nextPageSurveyRouting;
+      });
+    }
+  }
+
+  function missingSubmit_handler(e) {
+    e.preventDefault();
+
+    var nextMissingRelationship,
+      chosenItem = getChosenItem(),
+      relationshipDescriptionVal = chosenItem.val,
+      relationshipDescription = chosenItem.description,
+      newRelationship,
+      dbRelationshipId;
+
+    if (!relationshipDescription) {
+      throw Error('Relationship description not found: ', relationshipDescription);
+    }
+
+    newRelationship = storageAPI.addRelationship(
+      storageAPI.TYPES.relationship(
+        relationshipDescriptionVal,
+        personIs['@person'].id,
+        personTo['@person'].id
+      )
+    );
+
+    dbRelationshipId = newRelationship.id;
+
+    window.history.replaceState(null, '', '?edit=' + dbRelationshipId + nextPageSurveyRouting);
+
+    storageAPI.inferRelationships(newRelationship, personIs, personTo);
+
+    nextMissingRelationship = storageAPI.findNextMissingRelationship();
+
+    /**
+     * Routing
+     */
+    if(redirect) {
+      window.location.href = redirect;
+    }
+    else if (nextMissingRelationship) {
+      dynamicRouting();
+    }
+    else {
+      window.location.href = '../relationships-summary-proxy/?noop=1' +
+        nextPageSurveyRouting;
+    }
+  }
+
+  function dynamicRouting() {
+    var personIsId = personIs['@person'].id,
+      personToId = personTo['@person'].id,
+      chosenItem = getChosenItem(),
+      relationshipDescriptionVal = chosenItem.val,
+      subjectPersonId,
+      subjectRelationshipDescription,
+      missingRelationshipsForPerson =
+       storageAPI.getPeopleIdsMissingRelationshipsWithPerson(personToId);
+
+      /**
+       * Question strategies
+       *
+       * If child-parent relationship type was selected
+       * and there are missing relationships for this person
+       */
+      /*if(relationshipDescriptionVal === 'mother-father' &&
+        storageAPI.getPeopleIdsMissingRelationshipsWithPerson(personIsId).length) {
+        subjectPersonId = personIsId;
+      }
+      else if(relationshipDescriptionVal === 'son-daughter' &&
+        storageAPI.getPeopleIdsMissingRelationshipsWithPerson(personToId).length) {
+        subjectPersonId = personToId;
+        subjectRelationshipDescription = 'mother-father';
+      }
+      else if(relationshipDescriptionVal === 'unrelated' &&
+        storageAPI.getPeopleIdsMissingRelationshipsWithPerson(personIsId).length &&
+
+        /!**
+         * And personIs already has the same relationship type with someone
+         * else
+         *!/
+        storageAPI.getAllManualRelationships()
+          .filter(storageAPI.isInRelationship.bind(null, personIsId))
+          .filter(storageAPI.isRelationshipType.bind(null, relationshipDescriptionVal))
+          .length > 1
+      ) {
+        subjectPersonId = personIsId;
+      }*/
+
+    if(relationshipDescriptionVal === 'unrelated' &&
+      missingRelationshipsForPerson.length &&
+      missingRelationshipsForPerson.length > 1 &&
+
+      /**
+       * And personIs already has the same relationship type with someone else
+       */
+      storageAPI.getAllManualRelationships()
+        .filter(storageAPI.isInRelationship.bind(null, personToId))
+        .filter(storageAPI.isRelationshipType.bind(null, relationshipDescriptionVal))
+        .length > 1
+    ) {
+      subjectPersonId = personToId;
+    }
+
+    subjectRelationshipDescription = subjectRelationshipDescription ||
+      relationshipDescriptionVal;
+
+    if(subjectPersonId) {
+      window.location.href = '../relationships-person-select/?person=' +
+        subjectPersonId + '&relationship-description=' +
+        subjectRelationshipDescription +
+        nextPageSurveyRouting;
+    }
+    else {
+      window.location.href = '../relationships/?noop=1' + nextPageSurveyRouting;
+    }
+  }
+
+  $('[name="relationship"]').on('change', function() {
+    var relationshipDescription =
+      storageAPI.relationshipDescriptionMap[$(this).val()];
+    updateQuestion({
+      personIs: personIs,
+      personTo: personTo
+    }, relationshipDescription);
+
+    updateAnswer({
+      personIs: personIs,
+      personTo: personTo
+    }, relationshipDescription);
+  });
+
+  $(function() {
+
+    /**
+     * Code branching - are we trying to edit or create a new relationship
+     */
+    if (editRelationshipId) {
+      journeyEditRelationship();
+    }
+    else {
+      journeyCreateNewRelationship();
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/remove-household-member.html b/_prototypes/your-household-v13/remove-household-member.html
new file mode 100644
index 0000000000..0e0c7d7ef9
--- /dev/null
+++ b/_prototypes/your-household-v13/remove-household-member.html
@@ -0,0 +1,114 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../what-is-your-name">Previous
+        </a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+
+                                <div class="question u-mb-s">
+                                    <h1 class="question__title u-fs-l">
+                                        Are you sure you want to remove
+                                        <span
+                                                class="js-person-fullname-from-url-id"></span>?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--error u-mb-m">
+                                    <div class="panel__body">
+                                        <strong>All of the data entered
+                                            about this person will be removed
+                                        </strong>
+                                    </div>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--radio field--multiplechoice">
+                                            <fieldset class="u-mb-xl">
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="remove"
+                                                           value="yes"
+                                                           id="yes">
+                                                    <label class="label label--inline"
+                                                           for="yes">
+                                                        Yes, I want to remove this person
+                                                    </label>
+                                                </div>
+
+                                                <div class="field__item js-focusable-box">
+                                                    <input class="input input--radio js-focusable"
+                                                           type="radio"
+                                                           name="remove"
+                                                           value="no"
+                                                           id="no">
+                                                    <label class="label label--inline"
+                                                           for="no">
+                                                        No, I do not want to remove this person
+                                                    </label>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+    var storageAPI = window.ONS.storage,
+        urlParams = new URLSearchParams(window.location.search),
+        personId = urlParams.get('person'),
+        redirect = urlParams.get('redirect');
+
+    $('.qa-btn-submit').on('click', function (e) {
+      e.preventDefault();
+
+      if($('[name="remove"]:checked').val() === 'yes') {
+        storageAPI.deleteHouseholdMember(personId);
+        storageAPI.deleteAllRelationshipsForMember(personId);
+        storageAPI.removePersonalDetailsFor(personId);
+
+        window.location.href = redirect || '../summary/';
+      }
+      else {
+        window.location.href = '../who-else-to-add/?edit=' + personId;
+      }
+    });
+</script>
diff --git a/_prototypes/your-household-v13/request-survey-confirm-number.html b/_prototypes/your-household-v13/request-survey-confirm-number.html
new file mode 100644
index 0000000000..1b38def979
--- /dev/null
+++ b/_prototypes/your-household-v13/request-survey-confirm-number.html
@@ -0,0 +1,96 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../request-survey">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid">
+        <div class="grid__col col-7@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-l">
+                    <div class="block">
+                        <section class="section">
+                            <form autocomplete="off">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title" class="question__title u-fs-l js-piping">Is {x}{s} number correct?</h1>
+                                    <p class="js-piping">{n}</p>
+
+                                    <fieldset class="field field--radio field--multiplechoice ">
+                                        <legend class="u-vh js-piping">Is {x}{s} number correct?</legend>
+                                        <div class="field__item js-focusable-box">
+                                            <input class="input input--radio js-focusable" type="radio" name="number-correct" id="yes">
+                                            <label class="label label--inline" for="yes">Yes, send the text now</label>
+                                        </div>
+
+                                        <div class="field__item js-focusable-box">
+                                            <input class="input input--radio js-focusable" type="radio" name="number-correct" id="no">
+                                            <label class="label label--inline" for="no">No, I need to change it</label>
+                                        </div>
+                                    </fieldset>
+
+                                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mt-xl u-mb-xl" type="submit" name="">Continue</button>
+                                </div>
+                            </form>
+                        </section>
+                    </div>
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script>
+    var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+    var searchParams = new URLSearchParams(window.location.search);
+    var personId = searchParams.get('person_id');
+    var previousLink = document.querySelector('.js-previous-link');
+
+    if (!personId) {
+        personId = cannotAnswerPeople[0].id;
+    }
+
+    previousLink.setAttribute('href', previousLink.getAttribute('href') + '?person_id=' + personId);
+
+    var person = JSON.parse(sessionStorage.getItem('household-members')).find(function(person) { 
+        return person['@person'].id === personId;
+    })['@person'];
+
+    var pipingDestinations = Array.from(document.querySelectorAll('.js-piping'));
+    var possessive = person.fullName.slice(-1) === 's' ? "'" : "'s";
+
+    var cannotAnswerPerson = cannotAnswerPeople.find(function(p) {
+        return p.id === person.id;
+    });
+
+     pipingDestinations.forEach(function(pipingDestination) {
+        pipingDestination.innerHTML = pipingDestination.innerHTML
+            .replace('{x}', person.fullName)
+            .replace('{s}', possessive)
+            .replace('{n}', cannotAnswerPerson.phoneNumber.slice(0, 5) + ' ' + cannotAnswerPerson.phoneNumber.slice(5));
+    });
+
+    var form = document.querySelector('form');
+    
+    form.addEventListener('submit', function(event) {
+        event.preventDefault();
+
+        var responseOption = Array.from(document.querySelectorAll('input[type=radio]')).find(function(radio) {
+            return radio.checked;
+        }).id;
+
+        window.location.href = (responseOption === 'yes' ?
+            '../request-survey-confirmation' :
+            '../request-survey')
+            + '?person_id=' + personId;
+    });
+</script>
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/request-survey-confirmation.html b/_prototypes/your-household-v13/request-survey-confirmation.html
new file mode 100644
index 0000000000..f245921dfb
--- /dev/null
+++ b/_prototypes/your-household-v13/request-survey-confirmation.html
@@ -0,0 +1,80 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid">
+        <div class="grid__col col-7@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-l">
+                    <div class="block">
+                        <section class="section">
+                            <form autocomplete="off">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title" class="question__title u-fs-l js-piping">We have sent a text message to {n}</h1>
+                                    <p class="js-piping">{x} should recieve a text message with their own access code to complete their own survey soon.</p>
+
+                                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mt-xl u-mb-xl" type="submit" name="">Continue</button>
+                                </div>
+                            </form>
+                        </section>
+                    </div>
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script>
+    var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+    var searchParams = new URLSearchParams(window.location.search);
+    var personId = searchParams.get('person_id');
+
+    if (!personId) {
+        personId = cannotAnswerPeople[0].id;
+    }
+
+    var person = JSON.parse(sessionStorage.getItem('household-members')).find(function(person) { 
+        return person['@person'].id === personId;
+    })['@person'];
+
+    var pipingDestinations = Array.from(document.querySelectorAll('.js-piping'));
+    var possessive = person.fullName.slice(-1) === 's' ? "'" : "'s";
+
+    var cannotAnswerPerson = cannotAnswerPeople.find(function(p) {
+        return p.id === person.id;
+    });
+
+     pipingDestinations.forEach(function(pipingDestination) {
+        pipingDestination.innerHTML = pipingDestination.innerHTML
+            .replace('{x}', person.fullName)
+            .replace('{s}', possessive)
+            .replace('{n}', cannotAnswerPerson.phoneNumber.slice(0, 5) + ' ' + cannotAnswerPerson.phoneNumber.slice(5));
+    });
+
+    var form = document.querySelector('form');
+    
+    form.addEventListener('submit', function(event) {
+        event.preventDefault();
+
+        var nextPerson = cannotAnswerPeople.find(function(person) {
+            return !person.responseOption;
+        });
+
+        if (nextPerson) {
+            window.location.href = '../uac-question?person_id=' + nextPerson.id;
+        } else {
+            window.location.href = '../hub';
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/request-survey.html b/_prototypes/your-household-v13/request-survey.html
new file mode 100644
index 0000000000..dbc99f1146
--- /dev/null
+++ b/_prototypes/your-household-v13/request-survey.html
@@ -0,0 +1,88 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../uac-question">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid">
+        <div class="grid__col col-7@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-l">
+                    <div class="block">
+                        <section class="section">
+                            <form autocomplete="off">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title" class="question__title u-fs-l js-piping">Requesting a seperate survey for {x}</h1>
+                                    <p class="js-piping">If you have {x}{s} mobile number, we can send a text message to let them know you have requested a seperate survey for them to complete.</p>
+                                    <p>Alternatively, you can <a href="#">contact us</a> for help</p>
+                                    
+                                    <div class="field u-mt-m">
+                                        <label class="label js-piping" for="phone">Enter {x}{s} mobile number</label>
+                                        <input class="input input--text" type="tel" id="phone">
+                                    </div>
+
+                                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mt-xl u-mb-xl" type="submit" name="">Continue</button>
+                                </div>
+                            </form>
+                        </section>
+                    </div>
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script>
+    var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+    var searchParams = new URLSearchParams(window.location.search);
+    var personId = searchParams.get('person_id');
+    var previousLink = document.querySelector('.js-previous-link');
+    var input = document.getElementById('phone');
+
+    if (!personId) {
+        personId = cannotAnswerPeople[0].id;
+    }
+
+    previousLink.setAttribute('href', previousLink.getAttribute('href') + '?person_id=' + personId);
+
+    var person = JSON.parse(sessionStorage.getItem('household-members')).find(function(person) { 
+        return person['@person'].id === personId;
+    })['@person'];
+
+    var pipingDestinations = Array.from(document.querySelectorAll('.js-piping'));
+    var possessive = person.fullName.slice(-1) === 's' ? "'" : "'s";
+
+    pipingDestinations.forEach(function(pipingDestination) {
+        pipingDestination.innerHTML = pipingDestination.innerHTML.replace('{x}', person.fullName).replace('{s}', possessive);
+    });
+
+    var cannotAnswerPerson = cannotAnswerPeople.find(function(p) {
+        return p.id === person.id;
+    });
+
+    if (cannotAnswerPerson.phoneNumber) {
+        input.value = cannotAnswerPerson.phoneNumber.slice(0, 5) + ' ' + cannotAnswerPerson.phoneNumber.slice(5);
+    }
+
+    var form = document.querySelector('form');
+    
+    form.addEventListener('submit', function(event) {
+        event.preventDefault();
+
+        cannotAnswerPerson.phoneNumber = input.value.trim().replace(/ /g, '');
+
+        sessionStorage.setItem('cannot-answer-people', JSON.stringify(cannotAnswerPeople));
+
+        window.location.href = '../request-survey-confirm-number?person_id=' + personId;
+    });
+</script>
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/section-intro.html b/_prototypes/your-household-v13/section-intro.html
new file mode 100644
index 0000000000..c720787340
--- /dev/null
+++ b/_prototypes/your-household-v13/section-intro.html
@@ -0,0 +1,68 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <!--<div class="container">
+        <a class="js-previous-link mars" href="../confirm-address">Previous</a>
+    </div>-->
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-xl">
+                    <div class="block">
+                        <section class="section">
+                            <h1 class="u-fs-l">People who live here</h1>
+
+                            <p>In this section, we’re going to ask you about the people living or staying at
+                                <span class="address-text"></span>.</p>
+
+                            <h3 class="u-fs-m">Information you will need:</h3>
+                            <ul>
+                                <li>Names of the people living at this address including anyone temporarily away or who has been or intends to be in the UK 3 months or more.</li>
+                                <li>Names of visitors staying overnight at this address on <span
+                                            class="js-significant-date"></span></li>
+                            </ul>
+                        </section>
+                    </div>
+                </div>
+
+                <button class="btn btn--primary btn--lg qa-btn-submit btn-submit"
+                        type="submit" name="">Continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  $('.btn-submit').click(function(e) {
+    e.preventDefault(); // do not submit the form like usual
+    window.location = '../do-you-live-here/';
+  });
+
+  $(function() {
+    var oneWeekAgo = new Date();
+    oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+    var options = {year: 'numeric', month: 'long', day: 'numeric'};
+    $('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
+  });
+</script>
+
+
+
diff --git a/_prototypes/your-household-v13/style.css b/_prototypes/your-household-v13/style.css
new file mode 100644
index 0000000000..389d133c45
--- /dev/null
+++ b/_prototypes/your-household-v13/style.css
@@ -0,0 +1,138 @@
+.list.list--people-plain {
+  margin-bottom : 1rem;
+  list-style-type : none;
+}
+
+.list.list--people-plain .list__item {
+  background: url(/img/icons/person.svg) 0 .2rem no-repeat;
+}
+
+.list.list--people-plain .list__item-name {
+  padding-left: 1.5rem;
+}
+
+.list.list--people-plain .list__item-actions {
+  margin-top: -4px;
+}
+
+.list.list--people-plain .list__item-action + .list__item-action {
+  margin-left : .5rem;
+}
+
+
+/**
+ * Sumamry records
+ */
+.list.list--records .list__item {
+    margin-bottom: 0;
+    padding: 1rem 0;
+}
+
+.list.list--records .list__item + .list__item {
+    border-top: 1px solid #ccc;
+}
+
+.list.list--people {
+    list-style-type: none;
+}
+
+.list.list--people .list__item {
+    background: url(/img/icons/person.svg) 0 1.3rem no-repeat;
+}
+
+.list.list--people .list__item-name {
+    padding-left: 2rem;
+}
+
+.list.list--people .list__item-action + .list__item-action {
+    margin-left: .5rem;
+}
+
+
+.modal {
+    position: fixed;
+    z-index: 1000;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.modal__window {
+    position: relative;
+    background-color: white;
+    max-width: 520px;
+    padding: 2rem;
+    text-align: center;
+}
+
+/**
+ * Pattern library fix
+ */
+.header {
+  margin-bottom : 0;
+}
+
+.lock {
+    padding-left : 1.5rem;
+    background : url('../img/icons/lockicon.svg') no-repeat left top;
+}
+
+.footer {
+    margin-top : 7rem;
+}
+
+.util-language {
+    float : right;
+}
+
+.btn--danger {
+    background-color : #D0021B;
+    border-color : #D0021B;
+}
+
+.btn--danger:hover {
+    background-color : #b00015;
+    border-color : #b00015;
+}
+
+.page__content {
+    padding-bottom : .5rem;
+}
+
+.ghost-link {
+    position : absolute;
+    bottom : 1rem;
+    right : 1rem;
+    margin-right : 0 !important;
+    color : #aaa;
+}
+
+.footer {
+    position : relative;
+}
+
+/**
+ * Save and complete later - copied from design system
+ */
+.btn--ghost-blue {
+    background-color: transparent;
+    color: #4263c2;
+    border-color: #334f9e;
+    border-width: 2px;
+    padding: .5rem 1rem
+}
+
+.btn--ghost-blue:focus, .btn--ghost-blue:hover {
+    color: #4263c2;
+    background-color: transparent;
+    border-color: #4263c2
+}
+
+.btn--ghost-blue:focus {
+    outline: 3px solid #fe781f
+}
diff --git a/_prototypes/your-household-v13/summary.html b/_prototypes/your-household-v13/summary.html
new file mode 100644
index 0000000000..82ee43131e
--- /dev/null
+++ b/_prototypes/your-household-v13/summary.html
@@ -0,0 +1,181 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../visitors">Previous</a>
+    </div>
+</div>
+
+<style>
+    .list.list--records {
+        border-top: 1px solid #ccc;
+        border-bottom: 1px solid #ccc;
+    }
+</style>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 class="question__title u-fs-l js-heading">
+                                        People who live here and overnight
+                                        visitors
+                                    </h1>
+                                </div>
+
+                                <div class="panel panel--simple panel--success js-panel"
+                                    id="question-guidance-everyone-at-address-confirmation-question"
+                                    style="display:none;">
+                                    <strong class="u-mb-s">This section is now complete</strong>
+                                    <p>You can check your answers below</p>
+                                </div>
+                                <br />
+
+                                <h2
+                                        class="u-fs-m js-household-people-list">You&rsquo;ve added <span class="highlight">{n}</span> household member<span class="js-household-people-plural" style="display: none">s</span></h2>
+                                <ul
+                                    class="list list--records list--people u-mb-s js-records js-household-members-summary"></ul>
+                                <p id="nobody-notice"
+                                   style="display:none;">Nobody usually
+                                    lives here</p>
+                                <p class="u-mb-xl">
+                                    <a
+                                            href="../who-else-to-add/?redirect=../summary/"
+                                       class="js-add-to-household">
+                                        Add someone to this household</a>
+                                </p>
+
+                                <div class="js-visitors-people-list">
+                                    <h2 class="u-fs-m js-visitors-people-title">You&rsquo;ve added <span class="highlight">{n}</span> visitor<span class="js-visitors-people-plural"></span> staying
+                                        overnight on <span class="js-significant-date"></span></h2>
+                                    <ul class="list list--records list--people u-mb-s js-records js-visitors-summary"></ul>
+                                    <p id="nobody-visitor-notice"
+                                       style="display:none;">There are no
+                                        visitors staying overnight on
+                                        <span class="js-significant-date"></span>.</p>
+                                    <p class="u-mb-xl"><a
+                                            href="../who-else-to-add?journey=visitors&redirect=../summary/">Add a visitor</a>
+                                    </p>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var urlParams = new URLSearchParams(window.location.search),
+    showPanel = urlParams.get('show-panel'),
+    surveyType = urlParams.get('survey'),
+    nextPage = surveyType
+      ? '../relationships-intro/?survey=' + surveyType
+      : '../relationships-intro';
+
+  function updateHouseholdMembersVisitors() {
+    var members = window.ONS.storage.getAllHouseholdMembers(),
+      userMember = members.filter(isUser)[0],
+      otherHouseholdMembers = members.filter(window.ONS.storage.isOtherHouseholdMember),
+      visitors = members.filter(window.ONS.storage.isVisitor),
+      householdMembers = otherHouseholdMembers,
+      numberOfHouseholdMembers,
+      peopleListTitle,
+      numberOfVisitors,
+      visitorsListTitle;
+
+    if (userMember) {
+      householdMembers = [userMember].concat(otherHouseholdMembers);
+    }
+
+
+    numberOfHouseholdMembers = householdMembers.length;
+    peopleListTitle = document.querySelector('.js-household-people-list');
+    peopleListTitle.innerHTML = peopleListTitle.innerHTML.replace('{n}',
+      window.ONS.utils.numberToWordsStyleguide(numberOfHouseholdMembers) || 0);
+
+    if(!numberOfHouseholdMembers) {
+      $('#nobody-notice').show();
+    }
+    
+    if (numberOfHouseholdMembers !== 1) {
+        document.querySelector('.js-household-people-plural').style.display = 'inline';
+    }
+
+    numberOfVisitors = visitors.length;
+
+    if(!numberOfVisitors) {
+      $('#nobody-visitor-notice').show();
+    }
+
+    visitorsListTitle = document.querySelector('.js-visitors-people-list');
+
+    visitorsListTitle.innerHTML = visitorsListTitle.innerHTML.replace('{n}',
+      window.ONS.utils.numberToWordsStyleguide(numberOfVisitors) || 0);
+
+    $('.js-visitors-people-plural').each(function(i, el) {
+      window.ONS.utils
+        .cleanHTMLPlaceholderStringReplacment(el,numberOfVisitors > 1 ? 's' : '');
+    });
+  }
+
+  $('#modal .close-modal-button').on('click', function(e) {
+    e.preventDefault();
+    $('#modal').hide();
+  });
+
+  $('.qa-btn-submit').on('click', function(e) {
+    e.preventDefault();
+
+    if (window.ONS.storage.getAllHouseholdMembers().length > 0) {
+      window.location.href = nextPage;
+    }
+    else {
+      alert('Journey for less than one person in household, not yet implemented');
+    }
+  });
+
+  function isUser(member) {
+    return member['@person'].id === window.ONS.storage.IDS.USER_HOUSEHOLD_MEMBER_ID;
+  } 
+
+  function updateContent () {
+    var $addToHousehould = $('.js-add-to-household');
+
+    if (surveyType === 'lms') {
+      $('.js-heading').html('About your household');
+      $addToHousehould.attr('href', '../lms/who-else-to-add/');
+    }
+
+    if(showPanel) {
+      $('.js-panel').show();
+    }
+  }
+
+  $(updateContent);
+  $(updateHouseholdMembersVisitors);
+</script>
diff --git a/_prototypes/your-household-v13/temp-away-from-home.html b/_prototypes/your-household-v13/temp-away-from-home.html
new file mode 100644
index 0000000000..6f6f3e163a
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-away-from-home.html
@@ -0,0 +1,101 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars"
+           href="../does-anyone-else-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="previous"
+                           value="temp-away-from-home"/>
+                    <input type="hidden" name="journey"
+                           value="temp-away-from-home"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section"
+                                     id="total-retail-turnover-section">
+
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1 class="question__title saturn">
+                                        Is there anyone else living at
+                                        <span class="address-text"></span>
+                                        who is currently away?
+                                    </h1>
+                                </div>
+
+                                <ul id="household-members"></ul>
+
+                                <div class="answer__fields js-fields">
+                                    <div class="field field--radio field--multiplechoice ">
+                                        <fieldset class="u-mb-xl">
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="temporary-members"
+                                                       id="yes-someone-else">
+                                                <label class="label label--inline venus"
+                                                       for="yes-someone-else">Yes,
+                                                    I need to add another person
+                                                    <span class="pluto u-db label--negative">
+                                                        Include people working or studying away
+                                                        from home, armed forces, people outside
+                                                        the UK for less than 12 months</span>
+                                                </label>
+                                            </div>
+
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="temporary-members"
+                                                       id="no">
+                                                <label class="label label--inline venus"
+                                                       for="no">No, this
+                                                is everyone</label>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes-someone-else");
+  $('.qa-btn-submit').click(function(e) {
+    if (yesbox.checked) {
+      document.trav.action = "../who-else-to-add";
+    } else {
+      document.trav.action = "../temp-living-here";
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/temp-living-here-feedback.html b/_prototypes/your-household-v13/temp-living-here-feedback.html
new file mode 100644
index 0000000000..382a75d5a2
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-living-here-feedback.html
@@ -0,0 +1,97 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../who-else-to-add">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="previous"
+                           value="temp-living-here"/>
+                    <input type="hidden" name="journey"
+                           value="temp-living-here"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section"
+                                     id="total-retail-turnover-section">
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1 class="question__title saturn">
+                                        Is there anyone else staying at
+                                        <span class="address-text"></span>
+                                        who does not have another UK address?
+                                    </h1>
+                                </div>
+
+                                <ul id="household-members"></ul>
+
+                                <div class="answer__fields js-fields">
+                                    <div class="field field--radio field--multiplechoice ">
+                                        <fieldset class="u-mb-xl">
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="does-anyone-else-live-here"
+                                                       id="yes-someone-else"
+                                                       value="yes">
+                                                <label class="label label--inline venus"
+                                                       for="yes-someone-else"
+                                                       id="yes-someone-else-label">Yes,
+                                                    I need to add someone
+                                                </label>
+                                            </div>
+
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="does-anyone-else-live-here"
+                                                       id="no" value="no">
+                                                <label class="label label--inline venus"
+                                                       for="no">No, this is
+                                                    everyone</label>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes-someone-else");
+  $('.qa-btn-submit').click(function(e) {
+    if (!yesbox.checked) {
+      document.trav.action = "../visitors";
+    } else {
+      document.trav.action = "../who-else-to-add";
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/temp-living-here.html b/_prototypes/your-household-v13/temp-living-here.html
new file mode 100644
index 0000000000..410a3d6c62
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-living-here.html
@@ -0,0 +1,111 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../who-else-to-add">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="previous"
+                           value="temp-living-here"/>
+                    <input type="hidden" name="journey"
+                           value="temp-living-here"/>
+                    <div class="group" id="rsi">
+                        <div class="block" id="total-retail-turnover">
+                            <section class="section"
+                                     id="total-retail-turnover-section">
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1 class="question__title saturn">
+                                        Is there anyone else staying at
+                                        <span class="address-text"></span>
+                                        who does not have another UK address?
+                                    </h1>
+                                </div>
+
+                                <ul id="household-members"></ul>
+
+                                <div
+                                        class="field field--checkbox field--multiplechoice field--exclusive u-mb-xl">
+                                    <fieldset>
+                                        <legend
+                                                class="field__legend mars u-vh">Select all that apply:</legend>
+                                        <div class="field__label venus">Select all that apply:</div>
+                                        <div class="field__item js-focusable-box">
+                                            <input
+                                                    class="input input--checkbox js-focusable js-exclusive-checkbox-group" name="away-type" value="no-address" id="no-address" type="checkbox" />
+                                            <label class="label label--inline venus " for="no-address">
+                                                Anyone staying temporarily who usually lives in the UK but does not have another UK address including friends and relatives
+                                            </label>
+                                        </div>
+                                        <div class="field__item js-focusable-box">
+                                            <input
+                                                    class="input input--checkbox js-focusable js-exclusive-checkbox-group" name="away-type" value="three-months-more" id="three-months-more" type="checkbox" />
+                                            <label class="label label--inline venus " for="three-months-more">
+                                                Anyone who usually lives outside
+                                                the UK who is staying in the UK
+                                                for 3 months or more
+                                            </label>
+                                        </div>
+                                        <div class="field__label u-mt-s venus" aria-hidden="true">Or</div>
+                                        <div class="field__item js-focusable-box">
+                                            <input
+                                                    class="input input--checkbox js-focusable js-exclusive-checkbox" name="away-type" value="no" id="none" type="checkbox" />
+                                            <label class="label label--inline venus " for="none">
+                                                <span class="u-vh">Or,</span>
+                                                No, there is no one else staying who does not have another UK address
+                                                <span
+                                                        class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                            </label>
+                                            <span class="js-exclusive-checkbox-alert u-vh" role="alert" aria-live="polite" data-adjective="deselected"></span>
+                                        </div>
+                                    </fieldset>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var yesbox = document.getElementById("yes-someone-else");
+  $('.qa-btn-submit').click(function(e) {
+    /*if (yesbox.checked) {
+      document.trav.action = "../who-else-to-add";
+    } else {
+      document.trav.action = "../visitors";
+    }*/
+
+    if($('[name=away-type]:checked').val() === "no") {
+      document.trav.action = "../visitors";
+    } else {
+      document.trav.action = "../who-else-to-add";
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/temp-types-feedback.html b/_prototypes/your-household-v13/temp-types-feedback.html
new file mode 100644
index 0000000000..dc1d2ff268
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-types-feedback.html
@@ -0,0 +1,135 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars" href="../do-you-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form id="form" name="trav" class="form qa-questionnaire-form"
+                      role="form" autocomplete="off" novalidate="">
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title"
+                                        class="question__title saturn">
+                                        Is there anyone else apart from the people already included, who you need to add?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-m">
+                                    <div class="panel__body">
+                                        <strong class="u-mb-xs u-d-b">Include
+                                        </strong>
+                                        <ul id="question-list"></ul>
+                                    </div>
+                                </div>
+
+                                <div id="member-list"></div>
+
+                                <div class="answer__fields js-fields">
+                                    <div class="field field--radio field--multiplechoice ">
+                                        <fieldset class="u-mb-xl">
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="is-this-everyone"
+                                                       id="yes-someone-else"
+                                                       value="yes">
+                                                <label class="label label--inline venus"
+                                                       for="yes-someone-else"
+                                                       id="yes-someone-else-label">Yes, I need to add someone
+                                                </label>
+                                            </div>
+
+                                            <div class="field__item js-focusable-box">
+                                                <input class="input input--radio js-focusable"
+                                                       type="radio"
+                                                       name="is-this-everyone"
+                                                       id="no" value="no">
+                                                <label class="label label--inline venus"
+                                                       for="no">No, this is everyone</label>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg qa-btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<ul style="display:none;">
+    <li id="question-list-item-template" class="list__item"></li>
+</ul>
+
+<script>
+  var storageAPI = window.ONS.storage,
+      yesbox = document.getElementById("yes-someone-else"),
+      awayTypesStr = new URLSearchParams(window.location.search).get('away-types');
+
+  if(!awayTypesStr) {
+	  throw Error('No sentence for away type found');
+  }
+
+  var awayTypes = JSON.parse(awayTypesStr)/*,
+	  awayTypeOriginal = [].concat(awayTypes);
+	  awayType = awayTypes.shift()*/;
+
+  function updateQuestionList() {
+    $('#question-list').append(awayTypes.map(function(awayType) {
+      var $nodeEl = $('#question-list-item-template').clone();
+
+      $nodeEl.html(storageAPI.tempAwayQuestionSentenceMap[awayType]);
+
+      return $nodeEl;
+    }));
+  }
+
+  $('.qa-btn-submit').click(function(e) {
+  	e.preventDefault();
+
+    /**
+     * Routing
+     */
+    if (!yesbox.checked) {
+      window.location.href = '../visitors/';
+    } else {
+      window.location.href = '../temp-types-question?away-types=' +
+        JSON.stringify(awayTypes);
+    }
+  });
+
+  $(updateQuestionList);
+
+  $(function() {
+    $('#member-list').html('<ul id="household-members"></ul>');
+    window.ONS.helpers.populateHouseholdList();
+  });
+</script>
diff --git a/_prototypes/your-household-v13/temp-types-living-away.html b/_prototypes/your-household-v13/temp-types-living-away.html
new file mode 100644
index 0000000000..af8270a6a5
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-types-living-away.html
@@ -0,0 +1,167 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link"
+           href="../does-anyone-else-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="away-journeys"
+                           value=""/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1 class="question__title u-fs-l js-heading">
+                                        <span class="js-heading-inner-part1"></span>
+                                    </h1>
+                                </div>
+
+                                <ul data-redirect="../temp-types-living-away/"
+                                    class="list list--records list--people u-mb-s js-records js-household-members-summary"></ul>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-s">
+                                    <div class="panel__body">
+                                        <strong class="u-mb-xs u-d-b">Include
+                                            people who are temporarily away
+                                        </strong>
+                                        <ul id="question-list-away"></ul>
+                                        <strong class="u-mb-xs u-mt-m u-d-b">Include
+                                            people who are temporarily staying
+                                        </strong>
+                                        <ul id="question-list-in"></ul>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <div class="answer__fields js-fields u-mt-m">
+                        <div class="field field--radio field--multiplechoice">
+                            <fieldset class="u-mb-l">
+                                <div class="field__item js-focusable-box">
+                                    <input class="input input--radio js-focusable"
+                                           type="radio"
+                                           name="away-type"
+                                           id="yes">
+                                    <label class="label label--inline"
+                                           for="yes">
+                                        Yes, I need to add someone
+                                    </label>
+                                </div>
+
+                                <div class="field__item js-focusable-box">
+                                    <input class="input input--radio js-focusable"
+                                           type="radio"
+                                           name="away-type"
+                                           id="no">
+                                    <label class="label label--inline"
+                                           for="no">
+                                        No, I do not need to add anyone
+                                    </label>
+                                </div>
+                            </fieldset>
+                        </div>
+                    </div>
+
+                    <div
+                            class="collapsible collapsible--simple js-collapsible js-collapsible-simple u-mb-m">
+                        <div class="js-collapsible-content">
+                            <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs-r--b" data-ga="click" data-ga-category="definition" data-ga-action="Open panel" data-ga-label="Why do we ask this question?">Why do we ask this question?</h3>
+                            <div class="collapsible__body js-collapsible-body">
+                                <p>We ask this question to help ensure that everyone is correctly counted on the census. This may include people who are staying temporarily or are away.</p>
+                                <button
+                                        class="btn btn--secondary btn--small js-collapsible-close u-no-js-hide" data-ga="click" data-ga-category="definition" data-ga-action="Close panel" data-ga-label="Why do we ask this question?">Hide this</button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<ul style="display:none;">
+    <li id="question-list-item-template"
+        class="list__item js-list-item-label"></li>
+</ul>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    urlParams = new URLSearchParams(window.location.search),
+    members = storageAPI.getAllHouseholdMembers().filter(storageAPI.isHouseholdMember),
+    yesbox = document.getElementById("yes"),
+    grouped = {
+      away: [
+        storageAPI.tempAwayQuestionSentenceMap['perm-away'],
+        storageAPI.tempAwayQuestionSentenceMap['armed-forces'],
+        storageAPI.tempAwayQuestionSentenceMap['less-twelve'],
+        storageAPI.tempAwayQuestionSentenceMap['other']
+      ],
+      in: [
+        storageAPI.tempAwayQuestionSentenceMap['usually-temp'],
+        storageAPI.tempAwayQuestionSentenceMap['three-more'],
+      ]
+    };
+
+  $('.qa-btn-submit').on('click', function(e) {
+    e.preventDefault();
+
+    window.location = yesbox.checked
+      ? '../who-else-to-add/?previous=temp-types-living-away&redirect=../temp-types-living-away'
+      : '../visitors/';
+  });
+
+  function createIncludeItem(text) {
+    var $nodeEl = $('#question-list-item-template').clone(),
+      $label = $nodeEl;
+
+    $nodeEl.attr('id', '');
+    $label.html(text);
+
+    return $nodeEl;
+  }
+
+  function updateQuestionList() {
+    $('#question-list-away').html(grouped.away.map(createIncludeItem));
+    $('#question-list-in').html(grouped.in.map(createIncludeItem));
+  }
+
+  function updateQuestion () {
+    $('.js-heading-inner-part1').html(members.length ?
+      'Apart from the people already included, is there anyone else who is temporarily away or staying you need to add to ' + sessionStorage.getItem('address-line-1') + '?':
+      'Is there anyone who is temporarily away or staying you need to add to ' + sessionStorage.getItem('address-line-1') + '?'
+    );
+  }
+
+  $(updateQuestionList);
+  $(updateQuestion);
+
+</script>
diff --git a/_prototypes/your-household-v13/temp-types-question.html b/_prototypes/your-household-v13/temp-types-question.html
new file mode 100644
index 0000000000..6e9559b7d5
--- /dev/null
+++ b/_prototypes/your-household-v13/temp-types-question.html
@@ -0,0 +1,162 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+cdn: v1.5.0
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link mars"
+           href="../does-anyone-else-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="away-journeys"
+                           value=""/>
+                    <div class="group u-mb-l">
+                        <div class="block">
+                            <section class="section">
+                                <div class="question u-mb-s"
+                                     id="total-retail-turnover-question">
+                                    <h1 class="question__title saturn">
+                                        Who do you need to add?
+                                    </h1>
+                                </div>
+
+                                <div
+                                        class="panel panel--simple panel--info u-mb-m">
+                                    <div class="panel__body">
+                                        <strong class="u-mb-xs u-d-b">Include
+                                        </strong>
+                                        <ul id="question-list"></ul>
+                                    </div>
+                                </div>
+
+                                <ul id="household-members" class="u-mb-l"></ul>
+
+                                <fieldset
+                                        class="question__fieldset js-question-fieldset u-mb-s">
+                                    <legend class="u-vh">What is your name?</legend>
+
+                                    <div class="question__answers">
+                                        <div class="question__answer">
+                                            <label class="label venus"
+                                                   for="first-name">
+                                                <div class="label__inner">
+                                                    First name
+                                                </div>
+                                            </label>
+                                            <input class="input input--text "
+                                                   id="first-name"
+                                                   data-qa="input-text" value=""/>
+                                        </div>
+
+                                        <div class="question__answer">
+                                            <label class="label venus ">
+                                                <div class="label__inner">
+                                                    Last name
+                                                </div>
+                                            </label>
+                                            <input class="input input--text "
+                                                   id="last-name"
+                                                   data-qa="input-text" value=""/>
+                                        </div>
+                                    </div>
+                                </fieldset>
+                            </section>
+                        </div>
+                    </div>
+                    <button class="btn btn--primary btn--lg btn-submit venus"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<ul style="display:none;">
+    <li id="question-list-item-template" class="list__item"></li>
+</ul>
+
+<script>
+  var storageAPI = window.ONS.storage,
+    userLiveAtAddress = storageAPI.doILiveHere(),
+    awayTypesStr = new URLSearchParams(window.location.search).get('away-types');
+
+  if(!awayTypesStr) {
+    throw Error('No sentence for away type found');
+  }
+
+  var awayTypes = JSON.parse(awayTypesStr),
+    awayType = [].concat(awayTypes).shift();
+
+
+  var editUserId = new URLSearchParams(window.location.search).get('edit'),
+    memberFound = null;
+
+  if (editUserId) {
+    memberFound = window.ONS.storage.getAllHouseholdMembers()
+      .filter(function(member) {
+        return member['@person'].id === editUserId;
+      })[0];
+  }
+
+  if (editUserId && !memberFound) {
+    throw Error('Member not found');
+  }
+
+  function updateQuestionList() {
+    $('#question-list').append(awayTypes.map(function(awayType) {
+      var $nodeEl = $('#question-list-item-template').clone();
+
+      $nodeEl.html(storageAPI.tempAwayQuestionSentenceMap[awayType]);
+
+      return $nodeEl;
+    }));
+  }
+
+  $('.js-question-sentence-by-type').html(storageAPI.tempAwayQuestionSentenceMap[awayType]);
+
+  $('.btn-submit').on('click', function(e) {
+    e.preventDefault();
+
+    var person = storageAPI.TYPES.person({
+      firstName: document.getElementById('first-name').value,
+      lastName: document.getElementById('last-name').value
+    });
+
+    var personType = storageAPI.KEYS['HOUSEHOLD_MEMBER_TYPE'];
+
+    if (editUserId && memberFound) {
+      person.id = editUserId;
+      window.ONS.storage['updateHouseholdMember'](person, {type: personType});
+    }
+    else {
+      window.ONS.storage['addHouseholdMember'](person, {type: personType});
+    }
+
+    /*window.location.href = '../temp-types-feedback?away-types=' +
+      JSON.stringify(awayTypes);*/
+
+    window.location = '../temp-types-feedback/?away-types=' + JSON.stringify(awayTypes);
+  });
+
+  $(updateQuestionList);
+</script>
diff --git a/_prototypes/your-household-v13/test-address.html b/_prototypes/your-household-v13/test-address.html
new file mode 100644
index 0000000000..d22c7c41c3
--- /dev/null
+++ b/_prototypes/your-household-v13/test-address.html
@@ -0,0 +1,224 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<style>
+    .input--text-lg {
+        width : 100%;
+    }
+
+    .input--text-postcode {
+        max-width : 9.25rem;
+    }
+</style>
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="feedback__inline js-feedback-inline is-collapsed">
+                    <div class="feedback__border">
+                        <form id="feedback-form" method="POST"
+                              class="feedback__form">
+                            <div class="group">
+                                <div class="feedback__field">
+
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="group u-mb-xl" id="what-is-your-address-group">
+                    <div class="block" id="what-is-your-address">
+                        <div class="question"
+                             id="what-is-your-address-question">
+                            <h1 class="question__title u-fs-l"
+                                data-qa="question-title">
+                                What is your address?
+                            </h1>
+
+                            <fieldset
+                                    class="question__fieldset js-question-fieldset u-mb-m">
+
+                                <legend class="u-vh">What is your address?
+                                </legend>
+
+                                <div class="question__answers">
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-address-line-1">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label"
+                                                           for="address-line-1"
+                                                           id="label-address-line-1">
+                                                        <div class="label__inner">
+                                                            Building and street
+                                                        </div>
+                                                    </label>
+                                                    <input
+                                                            class="input input--text input--block u-mb-s"
+                                                           id="address-line-1"
+                                                           name="address-line-1"
+                                                           data-qa="input-text"
+                                                           value=""/>
+
+                                                    <input class="input input--text input--block"
+                                                           id="address-line-2"
+                                                           name="address-line-2"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-town-city">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label "
+                                                           for="town-city"
+                                                           id="label-town-city">
+                                                        <div class="label__inner">
+                                                            Town or City
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input class="input input--text "
+                                                           id="town-city"
+                                                           name="town-city"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-county">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label "
+                                                           for="county"
+                                                           id="label-county">
+                                                        <div class="label__inner">
+                                                            County (optional)
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input class="input input--text "
+                                                           id="county"
+                                                           name="county"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <div class="answer answer--textfield  "
+                                             id="container-postcode">
+                                            <div class="answer__fields js-fields">
+                                                <div class="field">
+                                                    <label class="label "
+                                                           for="postcode"
+                                                           id="label-postcode">
+                                                        <div class="label__inner">
+                                                            Postcode
+
+                                                        </div>
+                                                    </label>
+
+                                                    <input
+                                                            class="input input--text input--text-postcode"
+                                                           id="postcode"
+                                                           name="postcode"
+                                                           data-qa="input-text"
+                                                           value=""/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </div>
+                    </div>
+                </div>
+
+                <button class="btn btn-submit btn--primary btn--lg"
+                        data-qa="btn-submit" type="submit"
+                        name="action[save_continue]">Save and continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  $('.btn-submit').click(function(e) {
+    e.preventDefault(); // do not submit the form like usual
+
+    var isEditing =
+      new URLSearchParams(window.location.search).get('edit') === 'true';
+
+    sessionStorage.setItem('address', getAddress());
+
+    sessionStorage.setItem('address-line-1',
+      document.getElementById('address-line-1').value);
+    sessionStorage.setItem('address-line-2',
+      document.getElementById('address-line-2').value);
+    sessionStorage.setItem('town-city', document.getElementById('town-city').value);
+    sessionStorage.setItem('county', document.getElementById('county').value);
+    sessionStorage.setItem('postcode', document.getElementById('postcode').value);
+
+    window.location = isEditing ? '../confirm-address/' : '../index/';
+  });
+
+  function getAddress() {
+    var array = [
+
+      document.getElementById('address-line-1').value,
+      document.getElementById('address-line-2').value,
+      document.getElementById('town-city').value,
+      document.getElementById('county').value,
+      document.getElementById('postcode').value,
+
+    ];
+    return array.filter(filterAddressLine).join(', ');
+  }
+
+  function filterAddressLine(value) {
+    return value;
+  }
+
+  function updateEditableAddress() {
+    $('#address-line-1').val(sessionStorage.getItem('address-line-1'));
+    $('#address-line-2').val(sessionStorage.getItem('address-line-2'));
+    $('#town-city').val(sessionStorage.getItem('town-city'));
+    $('#county').val(sessionStorage.getItem('county'));
+    $('#postcode').val(sessionStorage.getItem('postcode'));
+  }
+
+  $(updateEditableAddress);
+</script>
+
diff --git a/_prototypes/your-household-v13/test-data.html b/_prototypes/your-household-v13/test-data.html
new file mode 100644
index 0000000000..5e8035c1ec
--- /dev/null
+++ b/_prototypes/your-household-v13/test-data.html
@@ -0,0 +1,105 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="mars" href="../confirm-address">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <h1 id="question-title"
+                    class="question__title u-fs-l js-heading">
+                    Test data
+                </h1>
+
+                <div class="group u-mb-xl">
+                    <div class="block">
+                        <section class="section">
+                            <ul class="test-data-links">
+                            </ul>
+                        </section>
+                    </div>
+                </div>
+
+                <div class="u-mb-xl">
+                    <label class="label">Load session file</label>
+                    <input type="file" id="fileInput" />
+                </div>
+
+                <div>
+                    <label class="label">Save session</label>
+                    <input type="text" id="file-name"
+                           class="input input--text input-type__input u-mb-m"
+                           placeholder="Enter file name"
+                           data-autocomplete="off" />
+
+                    <button class="btn btn--primary venus js-btn-submit"
+                            type="submit">Save
+                    </button>
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+    $('.js-btn-submit').on('click', function(e) {
+      e.preventDefault();
+
+      var file = new File(
+        [JSON.stringify(sessionStorage)],
+        'census-prototype.json',
+        {
+          type: "application/json;charset=utf-8"
+        }
+      );
+
+      saveAs(file, $('#file-name').val().replace(' ', ''));
+    });
+
+    $(function() {
+      var fileInput = document.getElementById('fileInput');
+
+      fileInput.addEventListener('change', function(e) {
+        var file = fileInput.files[0];
+        var jsonType = /json.*/;
+
+        if (file.type.match(jsonType)) {
+          var reader = new FileReader();
+
+          reader.onload = function(e) {
+            var data = JSON.parse(reader.result),
+                bookmark = data['_session_bookmark'];
+
+            sessionStorage.clear();
+
+            $.each(Object.keys(data), function (i, k) {
+              sessionStorage.setItem(k, data[k]);
+            });
+
+            fileInput.value = '';
+
+            console.log(bookmark);
+
+            window.location.href = bookmark ? bookmark : '../hub';
+          };
+
+          reader.readAsText(fileInput.files[0]);
+        }
+      });
+    });
+</script>
diff --git a/_prototypes/your-household-v13/test-data/basic4personhousehold.json b/_prototypes/your-household-v13/test-data/basic4personhousehold.json
new file mode 100644
index 0000000000..40fa35583d
--- /dev/null
+++ b/_prototypes/your-household-v13/test-data/basic4personhousehold.json
@@ -0,0 +1 @@
+{"address":"12 Somewhere Close, Newport, CF12 3AB","address-line-1":"12","address-line-2":"Somewhere close","county":"Newport","household-members":"[{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Dave  Jones\",\"firstName\":\"Dave\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person_me\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Sally  Jones\",\"firstName\":\"Sally\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person1\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Rebecca  Jones\",\"firstName\":\"Rebecca\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person2\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Amy Jones\",\"firstName\":\"Amy\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person3\"}}]","household-members-increment":"4","lives-here":"yes","postcode":"CF12 3AB","proxy-person":"false","relationships":"[{\"personIsDescription\":\"husband-wife\",\"personIsId\":\"person1\",\"personToId\":\"person_me\",\"inferred\":false,\"id\":1},{\"personIsDescription\":\"son-daughter\",\"personIsId\":\"person2\",\"personToId\":\"person_me\",\"inferred\":false,\"id\":2},{\"personIsDescription\":\"mother-father\",\"personIsId\":\"person_me\",\"personToId\":\"person3\",\"inferred\":false,\"id\":3},{\"personIsDescription\":\"son-daughter\",\"personIsId\":\"person2\",\"personToId\":\"person1\",\"inferred\":false,\"id\":4},{\"personIsDescription\":\"mother-father\",\"personIsId\":\"person1\",\"personToId\":\"person3\",\"inferred\":false,\"id\":5},{\"personIsDescription\":\"brother-sister\",\"personIsId\":\"person3\",\"personToId\":\"person2\",\"inferred\":true,\"inferredBy\":[3,5,2,4],\"id\":6}]","relationships-increment":"6","town-city":"Newport","user-details":"{\"fullName\":\"Dave  Jones\",\"firstName\":\"Dave\",\"middleName\":\"\",\"lastName\":\"Jones\"}"}
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/test-data/basic4personindividualdetails.json b/_prototypes/your-household-v13/test-data/basic4personindividualdetails.json
new file mode 100644
index 0000000000..86130c0841
--- /dev/null
+++ b/_prototypes/your-household-v13/test-data/basic4personindividualdetails.json
@@ -0,0 +1 @@
+{"address":"12 Somewhere Close, Newport, CF12 3AB","address-line-1":"12","address-line-2":"Somewhere close","county":"Newport","household-members":"[{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Dave  Jones\",\"firstName\":\"Dave\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person_me\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Sally  Jones\",\"firstName\":\"Sally\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person1\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Rebecca  Jones\",\"firstName\":\"Rebecca\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person2\"}},{\"type\":\"household-member\",\"@person\":{\"fullName\":\"Amy Jones\",\"firstName\":\"Amy\",\"middleName\":\"\",\"lastName\":\"Jones\",\"id\":\"person3\"}}]","household-members-increment":"4","individual-details":"{\"person_me\":{\"sex\":\"male\",\"dob\":{\"day\":\"12\",\"month\":\"3\",\"year\":\"1982\"},\"age-confirm\":{\"val\":\"yes\"},\"maritalStatus\":\"married\",\"country\":{\"val\":\"elsewhere\",\"otherText\":\"French guiana\"},\"national-identity\":{\"collection\":[\"welsh\",\"british\"]},\"ethnic-group\":{\"val\":\"mixed\",\"description\":\"white-asian\"},\"passport\":{\"countries\":[\"ireland\",\"other\"],\"otherText\":\"British overseas territories (bot)\"},\"apprenticeship\":{\"hasApprenticeship\":\"yes\"},\"qualifications\":{\"aboveDegree\":\"yes\",\"nvqEquivalent\":[\"nvq-level-1\",\"nvq-level-3\"],\"aLevels\":[\"a-level-1-btec\"],\"gcses\":[\"gcse-5\"],\"othersWhere\":[\"none\"]},\"employment-status\":{\"val\":\"freelance-with-employees\"},\"job-title\":{\"val\":\"Binder's assistant\"},\"job-describe\":{\"val\":\"Assistance in binding\"}},\"person1\":{\"sex\":\"female\",\"dob\":{\"day\":\"23\",\"month\":\"6\",\"year\":\"1980\"},\"age-confirm\":{\"val\":\"yes\"},\"maritalStatus\":\"married\",\"country\":{\"val\":\"wales\"},\"national-identity\":{\"collection\":[\"english\",\"other\"],\"otherText\":\"French\"},\"ethnic-group\":{\"val\":\"white\",\"description\":\"other\",\"otherText\":\"English and french\"},\"passport\":{\"countries\":[\"united-kingdom\",\"ireland\"]},\"apprenticeship\":{\"hasApprenticeship\":\"no\"},\"qualifications\":{\"aboveDegree\":\"no\",\"nvqEquivalent\":[\"nvq-level-1\",\"nvq-level-3\"],\"aLevels\":[\"a-level-2\"],\"gcses\":[\"other-gcses\"],\"othersWhere\":[\"in-england-wales\",\"outside-england-wales\"]},\"employment-status\":{\"val\":\"freelance-without-employees\"},\"job-title\":{\"val\":\"Window cleaning contractor\"},\"job-describe\":{\"val\":\"Cleaning windows\"}},\"person2\":{\"sex\":\"female\",\"dob\":{\"day\":\"11\",\"month\":\"5\",\"year\":\"1999\"},\"age-confirm\":{\"val\":\"yes\"},\"maritalStatus\":\"never\",\"country\":{\"val\":\"england\"},\"national-identity\":{\"collection\":[\"english\",\"other\"],\"otherText\":\"Beninese\"},\"ethnic-group\":{\"val\":\"white\",\"description\":\"british\"},\"passport\":{\"countries\":[\"united-kingdom\"]},\"apprenticeship\":{\"hasApprenticeship\":\"no\"},\"qualifications\":{\"aboveDegree\":\"no\",\"nvqEquivalent\":[\"nvq-level-2\"],\"aLevels\":[\"a-level-2\"],\"gcses\":[\"gcse-5\",\"other-gcses\",\"basic-skills\",\"national-baccalaureate\",\"foundation-baccalaureate\"],\"othersWhere\":[\"none\"]},\"employment-status\":{\"val\":\"employee\"},\"job-title\":{\"val\":\"Shop assistant\"},\"job-describe\":{\"val\":\"Shelf stacking\"}},\"person3\":{\"sex\":\"female\",\"dob\":{\"day\":\"15\",\"month\":\"10\",\"year\":\"2001\"},\"age-confirm\":{\"val\":\"yes\"},\"maritalStatus\":\"never\",\"country\":{\"val\":\"england\"},\"national-identity\":{\"collection\":[\"english\"]},\"ethnic-group\":{\"val\":\"white\",\"description\":\"british\"},\"passport\":{\"countries\":[\"united-kingdom\"]},\"apprenticeship\":{\"hasApprenticeship\":\"yes\"},\"qualifications\":{\"aboveDegree\":\"no\",\"nvqEquivalent\":[\"nvq-level-1\"],\"aLevels\":[\"none\"],\"gcses\":[\"gcse-5\",\"other-gcses\",\"basic-skills\"],\"othersWhere\":[\"in-england-wales\"]},\"employment-status\":{\"val\":\"employee\"},\"job-title\":{\"val\":\"Bartender\"},\"job-describe\":{\"val\":\"Serving drinks\"}}}","lives-here":"yes","postcode":"CF12 3AB","proxy-person":"false","relationships":"[{\"personIsDescription\":\"husband-wife\",\"personIsId\":\"person1\",\"personToId\":\"person_me\",\"inferred\":false,\"id\":1},{\"personIsDescription\":\"son-daughter\",\"personIsId\":\"person2\",\"personToId\":\"person_me\",\"inferred\":false,\"id\":2},{\"personIsDescription\":\"mother-father\",\"personIsId\":\"person_me\",\"personToId\":\"person3\",\"inferred\":false,\"id\":3},{\"personIsDescription\":\"son-daughter\",\"personIsId\":\"person2\",\"personToId\":\"person1\",\"inferred\":false,\"id\":4},{\"personIsDescription\":\"mother-father\",\"personIsId\":\"person1\",\"personToId\":\"person3\",\"inferred\":false,\"id\":5},{\"personIsDescription\":\"brother-sister\",\"personIsId\":\"person3\",\"personToId\":\"person2\",\"inferred\":true,\"inferredBy\":[3,5,2,4],\"id\":6}]","relationships-increment":"6","town-city":"Newport","user-details":"{\"fullName\":\"Dave  Jones\",\"firstName\":\"Dave\",\"middleName\":\"\",\"lastName\":\"Jones\"}"}
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/uac-question.html b/_prototypes/your-household-v13/uac-question.html
new file mode 100644
index 0000000000..49719a41aa
--- /dev/null
+++ b/_prototypes/your-household-v13/uac-question.html
@@ -0,0 +1,139 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../individual-decision-answer-behalf">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid">
+        <div class="grid__col col-7@l">
+            <main role="main" id="main" class="page__main">
+                <div class="group u-mb-l">
+                    <div class="block">
+                        <section class="section">
+                            <form autocomplete="off">
+                                <div class="question u-mb-s">
+                                    <h1 id="question-title" class="question__title u-fs-l js-piping">{x}{s} questions</h1>
+                                    <p class="js-piping">If you want {x} to complete their own questions, they will need the unique access code from the census letter we sent you.</p>
+                                    <p>Alternatively, you can request a seperate survey for them to complete.</p>
+
+                                    <fieldset class="field field--radio field--multiplechoice ">
+                                        <legend class="u-vh js-piping">{x}{s} questions</legend>
+                                        <div class="field__item js-focusable-box">
+                                            <input class="input input--radio js-focusable" type="radio" name="response-options" id="give-code">
+                                            <label class="label label--inline" for="give-code">I will give them the code and ask them to complete thier own questions</label>
+                                        </div>
+
+                                        <div class="field__item js-focusable-box">
+                                            <input class="input input--radio js-focusable" type="radio" name="response-options" id="new-survey">
+                                            <label class="label label--inline" for="new-survey">I would like to request a seperate survey for them to complete</label>
+                                        </div>
+
+                                        <span class="u-fs-r--b u-d-b u-mb-s u-mt-s" aria-hidden="true">Or</span><br>
+
+                                        <div class="field__item js-focusable-box">
+                                            <input class="input input--radio js-focusable" type="radio" name="response-options" id="complete-questions">
+                                            <label class="label label--inline" for="complete-questions"><span class="u-vh">or, </span>I will continue to answer their questions</label>
+                                        </div>
+                                    </fieldset>
+
+                                    <button class="btn btn--primary btn--lg qa-btn-submit venus u-mt-xl u-mb-xl" type="submit" name="">Continue</button>
+                                </div>
+                            </form>
+                        </section>
+                    </div>
+                </div>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script>
+    var cannotAnswerPeople = JSON.parse(sessionStorage.getItem('cannot-answer-people') || '[]');
+    var searchParams = new URLSearchParams(window.location.search);
+    var personId = searchParams.get('person_id');
+
+    if (!personId) {
+        personId = cannotAnswerPeople[0].id;
+    }
+
+    var person = JSON.parse(sessionStorage.getItem('household-members')).find(function(person) { 
+        return person['@person'].id === personId;
+    })['@person'];
+
+    var pipingDestinations = Array.from(document.querySelectorAll('.js-piping'));
+    var possessive = person.fullName.slice(-1) === 's' ? "'" : "'s";
+
+    pipingDestinations.forEach(function(pipingDestination) {
+        pipingDestination.innerHTML = pipingDestination.innerHTML.replace('{x}', person.fullName).replace('{s}', possessive);
+    });
+
+    var cannotAnswerPerson = cannotAnswerPeople.find(function(p) {
+        return p.id === person.id;
+    });
+
+    if (!cannotAnswerPerson) {
+        cannotAnswerPerson = {
+            id: person.id,
+            responseOption: null,
+            phoneNumber: null,
+        };
+
+        cannotAnswerPeople.push(cannotAnswerPerson)
+    }
+
+    if (cannotAnswerPerson.responseOption) {
+        document.getElementById(cannotAnswerPerson.responseOption).checked = true;
+    }
+
+    var form = document.querySelector('form');
+    
+    form.addEventListener('submit', function(event) {
+        event.preventDefault();
+
+        var responseOption = Array.from(document.querySelectorAll('input[type=radio]')).find(function(radio) {
+            return radio.checked;
+        }).id;
+
+        cannotAnswerPerson.responseOption = responseOption;
+
+        sessionStorage.setItem('cannot-answer-people', JSON.stringify(cannotAnswerPeople));
+
+        switch (responseOption) {
+            case 'new-survey': {
+                window.location.href = '../request-survey?person_id=' + personId;
+                break;
+            }
+            case 'complete-questions': {
+                window.location.href = '../individual-intro/?person=' + personId;
+                break;
+            }
+            default: {
+                var nextPerson = cannotAnswerPeople.find(function(person) {
+                    return !person.responseOption;
+                });
+
+                /*cannotAnswerPeople = cannotAnswerPeople.filter(function(person) {
+                    return person.id !== personId;
+                });
+
+                sessionStorage.setItem('cannot-answer-people', JSON.stringify(cannotAnswerPeople));*/
+
+                if (nextPerson) {
+                    window.location.href = '../uac-question?person_id=' + nextPerson.id;
+                } else {
+                    window.location.href = '../hub';
+                }
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/_prototypes/your-household-v13/visitors.html b/_prototypes/your-household-v13/visitors.html
new file mode 100644
index 0000000000..15e7480a9c
--- /dev/null
+++ b/_prototypes/your-household-v13/visitors.html
@@ -0,0 +1,163 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../temp-away-from-home">
+            Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <form name="trav" class="form qa-questionnaire-form" role="form"
+                      autocomplete="off" novalidate="">
+                    <input type="hidden" name="previous" value="visitors"/>
+                    <input type="hidden" name="journey" value="visitors"/>
+                    <div class="group">
+                        <div class="block">
+                            <section class="section u-mb-s">
+                                <div class="question">
+                                    <h1 class="question__title u-fs-l">
+                                        Are there any visitors staying
+                                        overnight on <span class="js-significant-date"></span> at
+                                        <span class="address-text"></span>?
+                                    </h1>
+                                </div>
+
+                                <div class="answer">
+                                    <div class="answer__fields js-fields">
+                                        <div class="field field--checkbox field--multiplechoice field--exclusive">
+                                            <fieldset>
+                                                <legend class="field__legend u-fs-r--b">Select all that apply:</legend>
+                                                <div class="field__item">
+                                                    <input
+                                                            class="input input--checkbox js-exclusive-group"
+                                                            name="away-type"
+                                                            value="usually-in-uk"
+                                                            id="usually-in-uk"
+                                                            type="checkbox"/>
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="usually-in-uk">
+                                                        People who usually live
+                                                        somewhere else in the
+                                                        UK, for example
+                                                        boy/girlfriends, friends
+                                                        or relatives</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="away-type"
+                                                           value="second-address"
+                                                           id="second-address"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="second-address">
+                                                        People staying here because it is their second address, for example, for work. Their permanent or family home is elsewhere</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="away-type"
+                                                           value="less-three"
+                                                           id="less-three"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="less-three">
+                                                        People who usually live outside the UK who are staying in the UK for less than three months</label>
+                                                </div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-group"
+                                                           name="away-type"
+                                                           value="on-holiday"
+                                                           id="on-holiday"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="on-holiday">
+                                                        People here on holiday</label>
+                                                </div>
+                                                <div class="field__label u-mt-s u-fs-r--b" aria-hidden="true">Or</div>
+                                                <div class="field__item">
+                                                    <input class="input input--checkbox js-exclusive-checkbox"
+                                                           name="heating-type"
+                                                           value="no"
+                                                           id="none"
+                                                           type="checkbox">
+                                                    <label class="label label--inline u-fs-r "
+                                                           for="none">
+                                                        <span class="u-vh">Or,</span>
+                                                        No, there are no
+                                                        visitors staying
+                                                        overnight on
+                                                        <span
+                                                                class="js-significant-date"></span><span
+                                                            class="u-vh">. Selecting this will uncheck all other checkboxes</span>
+                                                    </label>
+                                                    <span class="js-exclusive-alert u-vh"
+                                                          role="alert"
+                                                          aria-live="polite"
+                                                          data-adjective="deselected"></span>
+                                                </div>
+                                            </fieldset>
+                                        </div>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                    </div>
+
+                    <div
+                            class="collapsible collapsible--simple js-collapsible js-collapsible-simple u-mb-xl">
+                        <div class="js-collapsible-content">
+                            <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs-r--b" data-ga="click" data-ga-category="definition" data-ga-action="Open panel" data-ga-label="Why do I have to add visitors?">Why do I have to add visitors?</h3>
+                            <div class="collapsible__body js-collapsible-body">
+                                <p>We ask for visitor information to ensure that everyone is counted. This helps to produce accurate population estimates. Add any visitors, even if you think they may have been included on a census form at another address.</p>
+                                <button
+                                        class="btn btn--secondary btn--small js-collapsible-close u-no-js-hide" data-ga="click" data-ga-category="definition" data-ga-action="Close panel" data-ga-label="Why do I have to add visitors?">Hide this</button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <button class="btn btn--primary btn--lg qa-btn-submit"
+                            type="submit" name="">Save and continue
+                    </button>
+                </form>
+            </main>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var nobox = document.getElementById("none");
+
+  $('.qa-btn-submit').click(function(e) {
+    if (!nobox.checked) {
+      e.preventDefault();
+
+      var awayTypes = [];
+
+      $('[name=away-type]:checked').each(function (i, el) {
+        awayTypes.push($(el).val());
+      });
+
+      window.location.href =
+        '../who-else-to-add?previous=visitors&journey=visitors&visitor-types=' + JSON.stringify(awayTypes);
+    } else {
+      document.trav.action = "../summary";
+    }
+  });
+</script>
diff --git a/_prototypes/your-household-v13/what-is-your-name.html b/_prototypes/your-household-v13/what-is-your-name.html
new file mode 100644
index 0000000000..ffaae60bac
--- /dev/null
+++ b/_prototypes/your-household-v13/what-is-your-name.html
@@ -0,0 +1,224 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link" href="../section-intro">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="feedback__inline js-feedback-inline is-collapsed">
+                    <div class="feedback__border">
+                    </div>
+                </div>
+
+                <div class="group u-mb-s">
+                    <div class="block">
+
+                        <div class="question">
+                            <h1 class="question__title u-fs-l js-heading"
+                                data-qa="question-title">
+                                What is your name?
+                            </h1>
+
+                            <fieldset
+                                    class="question__fieldset js-question-fieldset">
+                                <legend class="u-vh">What is your name?</legend>
+
+                                <div class="question__answers">
+                                    <div class="question__answer">
+                                        <label class="label"
+                                               for="first-name">
+                                            <div class="label__inner">
+                                                First name
+                                            </div>
+                                        </label>
+                                        <input class="input input--text"
+                                               id="first-name"
+                                               data-qa="input-text" value=""/>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <label class="label" for="middle-name">
+                                            <div class="label__inner">
+                                                Middle name(s)
+                                            </div>
+                                        </label>
+                                        <input class="input input--text"
+                                               id="middle-name"
+                                               data-qa="input-text" value=""/>
+                                    </div>
+
+                                    <div class="question__answer">
+                                        <label class="label" for="last-name">
+                                            <div class="label__inner">
+                                                Last name
+                                            </div>
+                                        </label>
+                                        <input class="input input--text"
+                                               id="last-name"
+                                               data-qa="input-text" value=""/>
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </div>
+                    </div>
+                </div>
+
+                <!--<div class="js-remove-section"
+                     style="display:none;">
+                    <p>If you have added this person by mistake or if circumstances have changed, you can remove them.</p>
+
+                    <button
+                            class="btn btn&#45;&#45;secondary btn&#45;&#45;small js-remove-person">Remove this person</button>
+                </div>-->
+
+                <button class="btn btn-submit btn--primary btn--lg u-mt-xl"
+                        data-qa="btn-submit" type="submit"
+                        name="action[save_continue]">
+                    Save and continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div id="modal" class="modal" style="display: none;">
+    <div class="modal__window">
+        <h1 class="u-fs-l">Are you sure you want to remove <span
+                class="js-person-name"></span>?</h1>
+        <p class="u-mb-m">All of the data associated with this person will be deleted</p>
+
+        <div class="modal__buttons btn-group">
+            <div class="u-mb-xs">
+                <button class="btn btn-group__btn btn--danger remove-member-button">
+                    Yes, remove this person
+                </button>
+            </div>
+            <div>
+                <button class="btn btn-group__btn btn--secondary close-modal-button">
+                    No, cancel this
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var urlParams = new URLSearchParams(window.location.search),
+    isEditing = urlParams.get('edit') === 'true',
+    redirect = urlParams.get('redirect'),
+    livesHere = sessionStorage.getItem('lives-here') === 'yes',
+    storageAPI = window.ONS.storage,
+    userAsMember = storageAPI.getUserAsHouseholdMember(),
+    userPerson = userAsMember && userAsMember['@person'];
+
+  function removeMember_handler(member, e) {
+    e.preventDefault();
+    var modal = $('#modal'),
+      original = modal.find('.remove-member-button'),
+      newNode = original.clone();
+
+    newNode.on('click', confirmRemoveMember_handler.bind(null, member));
+    original.replaceWith(newNode);
+
+    modal.find('.js-person-name').html(member['@person'].fullName);
+
+    modal.show();
+  }
+
+  function confirmRemoveMember_handler(member) {
+    sessionStorage.setItem('lives-here', 'no');
+    storageAPI.deleteUserAsHouseholdMember();
+    storageAPI.deleteAllRelationshipsForMember(member['@person'].id);
+
+    window.location.href = redirect || '../summary/';
+  }
+
+  $('#modal .close-modal-button').on('click', function(e) {
+    e.preventDefault();
+    $('#modal').hide();
+  });
+
+  $('.js-remove-person').on('click', removeMember_handler.bind(null, userAsMember));
+
+  function updateQuestion() {
+    if(isEditing && userPerson) {
+      $('.js-heading').html('Change details for ' + userPerson.fullName + ' (You)');
+      $('.js-remove-section').show();
+    }
+  }
+
+  $('.btn-submit').on('click', function(e) {
+    e.preventDefault(); // do not submit the form like usual
+    sessionStorage.setItem('name', getName());
+
+    var newPersonObj = storageAPI.TYPES.person({
+      firstName: document.getElementById('first-name').value,
+      lastName: document.getElementById('last-name').value
+    });
+
+    storageAPI.addUserPerson(newPersonObj);
+
+    if(isEditing || livesHere) {
+      storageAPI.updateUserAsHouseholdMember(
+        newPersonObj,
+        isEditing
+          ? userAsMember
+          : {
+            type: window.ONS.storage.KEYS.HOUSEHOLD_MEMBER_TYPE
+          }
+      );
+    }
+    else {
+      storageAPI.deleteUserAsHouseholdMember();
+    }
+
+    if(redirect) {
+      window.location.href = redirect;
+    }
+    else {
+      window.location.href = isEditing ? '../summary/' :
+        '../does-anyone-else-live-here/';
+    }
+  });
+
+  function getName() {
+    return [
+      document.getElementById('first-name').value,
+      document.getElementById('last-name').value
+    ].filter(function(name) {
+      return name
+    }).join(' ');
+  }
+
+  $(function() {
+    var userPerson = storageAPI.getUserPerson();
+
+    if (userPerson) {
+      $('#first-name').val(userPerson.firstName);
+      $('#last-name').val(userPerson.lastName);
+    }
+  });
+
+  $(updateQuestion);
+</script>
+
diff --git a/_prototypes/your-household-v13/who-else-to-add.html b/_prototypes/your-household-v13/who-else-to-add.html
new file mode 100644
index 0000000000..6be5e92e98
--- /dev/null
+++ b/_prototypes/your-household-v13/who-else-to-add.html
@@ -0,0 +1,307 @@
+---
+title: Household prototype v13
+project: your-household
+globalcss: false
+layout: eq-default-extras
+assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
+---
+
+<link rel="stylesheet" href="../style.css"/>
+<div class="page__subheader">
+    <div class="container">
+        <a class="js-previous-link"
+           href="../does-anyone-else-live-here">Previous</a>
+    </div>
+</div>
+
+<div class="page__container container">
+    <div class="grid grid--reverse">
+        <div class="grid__col col-4@l">
+            <!--{% include navigation.html
+            items=site.data.your-household-v6.navigationItemsHousehold
+            nav-title-id="section-address" %}-->
+        </div>
+        <div class="grid__col col-7@l pull-1@l">
+            <main role="main" id="main" class="page__main">
+                <div class="feedback__inline js-feedback-inline is-collapsed">
+                    <div class="feedback__border">
+                    </div>
+                </div>
+
+                <div class="group u-mb-m">
+                    <div class="block">
+
+                        <div class="question u-mb-s">
+                            <h1 id="question-title"
+                                class="question__title u-fs-l"
+                                data-qa="question-title">
+                                Who do you need to add to <span class="address-text"></span>?
+                            </h1>
+                        </div>
+
+                        <div class="panel panel--simple panel--info u-mb-m js-visitor-panel" style="display: none">
+                            <div class="panel__body">
+                                <strong class="u-mb-xs u-d-b">Include</strong>
+                                <ul class="js-visitor-includes"></ul>
+                            </div>
+                        </div>
+
+                        <div id="member-list"></div>
+
+                        <!--<div class="js-remove-section u-mb-l"
+                             style="display:none;">
+                            <p>If you have added this person by mistake or if
+                                circumstances have changed, you can remove them.</p>
+
+                            <a class="js-remove-person"
+                                href="../remove-household-member/">Remove this
+                                person</a>
+
+                            &lt;!&ndash;<button
+                                    class="btn btn&#45;&#45;secondary btn&#45;&#45;small js-remove-person">Remove this person</button>&ndash;&gt;
+                        </div>-->
+
+                        <fieldset
+                                class="question__fieldset js-question-fieldset u-mb-s">
+                            <legend class="u-vh">Who do you need to add to <span class="address-text"></span>?</legend>
+
+                            <div class="question__answers">
+                                <div class="question__answer">
+                                    <label class="label"
+                                           for="first-name">
+                                        <div class="label__inner">
+                                            First name
+                                        </div>
+                                    </label>
+                                    <input class="input input--text"
+                                           id="first-name"
+                                           data-qa="input-text" value=""/>
+                                </div>
+
+                                <div class="question__answer">
+                                    <label class="label" for="middle-name">
+                                        <div class="label__inner">
+                                            Middle name(s)
+                                        </div>
+                                    </label>
+                                    <input class="input input--text"
+                                           id="middle-name"
+                                           data-qa="input-text" value=""/>
+                                </div>
+
+                                <div class="question__answer">
+                                    <label class="label" for="last-name">
+                                        <div class="label__inner">
+                                            Last name
+                                        </div>
+                                    </label>
+                                    <input class="input input--text"
+                                           id="last-name"
+                                           data-qa="input-text" value=""/>
+                                </div>
+                            </div>
+                        </fieldset>
+                    </div>
+                </div>
+
+                <div
+                        class="collapsible collapsible--simple js-collapsible js-collapsible-simple js-visitor-definition u-mb-xs"
+                    style="display:none;">
+                    <div class="js-collapsible-content">
+                        <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs-r--b" data-ga="click" data-ga-category="definition" data-ga-action="Open panel" data-ga-label="Why do I have to add visitors?">Why do I have to add visitors?</h3>
+                        <div class="collapsible__body js-collapsible-body">
+                            <p>We ask for visitor information to ensure that everyone is counted. This helps to produce accurate population estimates. Add any visitors, even if you think they may have been included on a census form at another address.</p>
+                            <button class="btn--secondary btn--small js-collapsible-close u-no-js-hide" data-ga="click" data-ga-category="definition" data-ga-action="Close panel" data-ga-label="Why do I have to add visitors?">Hide this</button>
+                        </div>
+                    </div>
+                </div>
+
+                <p class="u-mb-no"><a class="js-cancel-return" href=""
+                      style="display:none;">Cancel and return to the previous
+                    question</a></p>
+
+                <button class="btn btn-submit btn--primary btn--lg u-mt-xl"
+                        data-qa="btn-submit" type="submit"
+                        name="action[save_continue]">
+                    Save and continue
+                </button>
+            </main>
+        </div>
+    </div>
+</div>
+
+<div id="modal" class="modal" style="display: none;">
+    <div class="modal__window">
+        <h1 class="u-fs-l">Are you sure you want to remove <span
+                class="js-person-name"></span>?</h1>
+        <p class="u-mb-m">All of the data associated with this person will be
+            deleted</p>
+
+        <div class="modal__buttons btn-group">
+            <div class="u-mb-xs">
+                <button class="btn btn-group__btn btn--danger remove-member-button">
+                    Yes, remove this person
+                </button>
+            </div>
+            <div>
+                <button class="btn btn-group__btn btn--secondary close-modal-button">
+                    No, cancel this
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src='/js/compiled/your-household-v13/bundle.js'></script>
+
+<script>
+  var urlParams = new URLSearchParams(window.location.search),
+    editUserId = urlParams.get('edit'),
+    previous = urlParams.get('previous'),
+    redirect = urlParams.get('redirect'),
+    storageAPI = window.ONS.storage,
+    memberFound = null,
+    userLiveAtAddress = storageAPI.doILiveHere(),
+    isLateAddition = !!urlParams.get('late-addition');
+
+  console.log(redirect);
+
+  if (editUserId) {
+    memberFound = window.ONS.storage.getAllHouseholdMembers()
+      .filter(function(member) {
+        return member['@person'].id === editUserId;
+      })[0];
+  }
+
+  if (editUserId && !memberFound) {
+    throw Error('Member not found');
+  }
+
+  var $removeLink = $('.js-remove-person');
+  $removeLink.attr(
+    'href', $removeLink.attr('href') + '?person=' + editUserId +
+    (redirect ? '&redirect=' + redirect : '')
+  );
+
+  var visitorTypesStr =
+    new URLSearchParams(window.location.search).get('visitor-types');
+
+  if (visitorTypesStr) {
+    var visitorTypes = JSON.parse(visitorTypesStr);
+
+    if (visitorTypes.length) {
+      document.querySelector('.js-visitor-panel').style.display = 'block';
+
+      var visitorIncludes = document.querySelector('.js-visitor-includes');
+
+      visitorTypes.forEach(function (type) {
+        var li = document.createElement('li');
+        li.className = 'list__item';
+
+        li.innerHTML = storageAPI.visitorQuestionSentenceMap[type];
+
+        visitorIncludes.appendChild(li);
+      });
+    }
+  }
+
+  $('.btn-submit').on('click', function(e) {
+    e.preventDefault(); // do not submit the form like usual
+
+    var person = window.ONS.storage.TYPES.person({
+      firstName: document.getElementById('first-name').value,
+      lastName: document.getElementById('last-name').value
+    });
+
+    var personType = window.ONS.storage.KEYS[
+      window.location.search.match(/journey=visitors/) ? 'VISITOR_TYPE' : 'HOUSEHOLD_MEMBER_TYPE'
+      ];
+
+    if (editUserId && memberFound) {
+      person.id = editUserId;
+      window.ONS.storage['updateHouseholdMember'](person, {type: personType});
+    }
+    else {
+      window.ONS.storage['addHouseholdMember'](person, {type: personType});
+    }
+
+    /**
+     * Routing
+     */
+    if(redirect) {
+      window.location = redirect;
+    } else if(editUserId) {
+      window.location = '../summary/';
+    } else if (window.location.search.match(/journey=temp-living-here/)) {
+      window.location = userLiveAtAddress
+        ? '../does-anyone-else-live-here/?redirect=../temp-living-here-feedback/'
+        : '../temp-living-here-feedback/';
+    } else if (window.location.search.match(/journey=temp-away-from-home/)) {
+      window.location = '../temp-away-from-home/';
+    } else if (window.location.search.match(/journey=visitors/)) {
+      window.location =
+        '../does-anyone-else-live-here/?journey=visitors&visitor-types=' + visitorTypesStr;
+    } else {
+      window.location = userLiveAtAddress
+        ? '../does-anyone-else-live-here/?redirect=../does-anyone-else-live-here/'
+        : '../does-anyone-else-live-here/';
+    }
+  });
+
+  $(function() {
+    var person,
+      addressLines = (sessionStorage.getItem('address') || '').split(','),
+      addressLine1 = addressLines[0],
+      addressLine2 = addressLines[1],
+      visitors = storageAPI.getAllHouseholdMembers()
+        .filter(storageAPI.isVisitor),
+      overrideTitle = 'What is the name of the ' +
+        (visitors.length > 0
+          ? window.ONS.utils.numberToPositionWord(visitors.length + 1) : '') +
+        ' visitor staying overnight on '
+        + window.ONS.utils.getSignificant() +
+        ' at ' +
+        addressLine1 + ', ' + addressLine2 + '?',
+
+      overrideTitleStayingOutsideUK = 'Who do you need to add to ' +
+        addressLine1 + ', ' + addressLine2 +
+        ' who does not have another UK address?';
+
+    if(editUserId) {
+      if (memberFound) {
+        person = memberFound['@person'];
+
+        $('#first-name').val(person.firstName);
+        $('#last-name').val(person.lastName);
+        $('#question-title').html('Change details for ' + person.fullName);
+        $('#member-list').remove();
+        /*$('.js-remove-section').show();*/
+      } else {
+        $('#question-title').html('Member not found');
+      }
+    }
+    else if (window.location.search.match(/journey=visitors/)) {
+      $('#question-title').html(overrideTitle);
+      $('.js-visitor-definition').show();
+    }
+    else if (window.location.search.match(/journey=temp-living-here/)) {
+      $('#question-title').html(overrideTitleStayingOutsideUK);
+    }
+
+    if(previous === 'temp-types-living-away' ||
+      previous === 'does-anyone-else-live-here' ||
+      previous === 'visitors' ||
+      previous === 'i-dont-live-here') {
+      $('.js-cancel-return').attr('href', document.referrer);
+      $('.js-cancel-return').show();
+    }
+
+    if (memberFound) {
+      person = memberFound['@person'];
+
+      $('#first-name').val(person.firstName);
+      $('#last-name').val(person.lastName);
+    }
+  });
+</script>
+
diff --git a/package-lock.json b/package-lock.json
index d11fa53685..5a8daa55da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,12 +24,6 @@
         "through": ">=2.2.7 <3"
       }
     },
-    "a-sync-waterfall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
-      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
-      "dev": true
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1105,6 +1099,23 @@
         "babel-types": "^6.24.1"
       }
     },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+        }
+      }
+    },
     "babel-preset-es2015": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
@@ -1196,6 +1207,11 @@
         "babel-plugin-transform-object-rest-spread": "^6.22.0"
       }
     },
+    "babel-regenerator-runtime": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.5.0.tgz",
+      "integrity": "sha1-DkHNHJ+ARCRm8BXHSf/4upj44RA="
+    },
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
@@ -1232,7 +1248,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -2116,8 +2131,7 @@
     "core-js": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-      "dev": true
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -4639,232 +4653,6 @@
         "through2": "^2.0.0"
       }
     },
-    "gulp-nunjucks-render": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.1.tgz",
-      "integrity": "sha1-Nxxqyv6Uup1pzlpfxDwVI4Y7EPA=",
-      "dev": true,
-      "requires": {
-        "gulp-util": "~2.2.0",
-        "lodash": "^3.10.0",
-        "nunjucks": "^3.0.0",
-        "through2": "~0.4.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          }
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "gulp-util": {
-          "version": "2.2.20",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-          "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-          "dev": true,
-          "requires": {
-            "chalk": "^0.5.0",
-            "dateformat": "^1.0.7-1.2.3",
-            "lodash._reinterpolate": "^2.4.1",
-            "lodash.template": "^2.4.1",
-            "minimist": "^0.2.0",
-            "multipipe": "^0.1.0",
-            "through2": "^0.5.0",
-            "vinyl": "^0.2.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-          "dev": true
-        },
-        "lodash.escape": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-          "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-          "dev": true,
-          "requires": {
-            "lodash._escapehtmlchar": "~2.4.1",
-            "lodash._reunescapedhtml": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        },
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        },
-        "lodash.template": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-          "dev": true,
-          "requires": {
-            "lodash._escapestringchar": "~2.4.1",
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.defaults": "~2.4.1",
-            "lodash.escape": "~2.4.1",
-            "lodash.keys": "~2.4.1",
-            "lodash.templatesettings": "~2.4.1",
-            "lodash.values": "~2.4.1"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.escape": "~2.4.1"
-          }
-        },
-        "minimist": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
-          },
-          "dependencies": {
-            "xtend": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-              "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-              "dev": true,
-              "requires": {
-                "object-keys": "~0.4.0"
-              }
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-          "dev": true,
-          "requires": {
-            "clone-stats": "~0.0.1"
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-          "dev": true
-        }
-      }
-    },
     "gulp-plumber": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz",
@@ -5993,51 +5781,18 @@
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
       "dev": true
     },
-    "lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1"
-      }
-    },
-    "lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
       "dev": true
     },
-    "lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
-    },
     "lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-      "dev": true
-    },
-    "lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-      "dev": true
-    },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -6056,44 +5811,12 @@
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
-    "lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "lodash._topath": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz",
@@ -6115,29 +5838,6 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.defaults": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -6165,15 +5865,6 @@
       "integrity": "sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=",
       "dev": true
     },
-    "lodash.isobject": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -6282,28 +5973,6 @@
         "lodash.escape": "^3.0.0"
       }
     },
-    "lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.keys": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-          "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-          "dev": true,
-          "requires": {
-            "lodash._isnative": "~2.4.1",
-            "lodash._shimkeys": "~2.4.1",
-            "lodash.isobject": "~2.4.1"
-          }
-        }
-      }
-    },
     "log-symbols": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
@@ -6768,41 +6437,6 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
-    "nunjucks": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz",
-      "integrity": "sha1-TedKPlULr2+jNwMj89HHwqhr3E0=",
-      "dev": true,
-      "requires": {
-        "a-sync-waterfall": "^1.0.0",
-        "asap": "^2.0.3",
-        "chokidar": "^1.6.0",
-        "yargs": "^3.32.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.32.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^2.0.1",
-            "cliui": "^3.0.3",
-            "decamelize": "^1.1.1",
-            "os-locale": "^1.4.0",
-            "string-width": "^1.0.1",
-            "window-size": "^0.1.4",
-            "y18n": "^3.2.0"
-          }
-        }
-      }
-    },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
@@ -6821,12 +6455,6 @@
       "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
       "dev": true
     },
-    "object-keys": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-      "dev": true
-    },
     "object-path": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
@@ -7728,8 +7356,7 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-      "dev": true
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
     },
     "regenerator-transform": {
       "version": "0.10.1",