From 093cba5d70f60e3cf7a8b6484ef13bd52be0b883 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 6 Apr 2022 16:52:22 +0100
Subject: [PATCH] added form ordering and validation for s78

---
 .env.local                                   |   12 +-
 components/breadcrumbs.js                    |   47 +
 components/elements/index.js                 |  686 +++++++--
 components/homepage/login.js                 |    4 +-
 components/newappeal/aboutyou.js             |  448 ++++++
 components/newappeal/buildfield.js           |   71 +-
 components/newappeal/buildrow.js             |   80 +-
 components/newappeal/buildsection.js         |   49 +-
 components/newappeal/complete.js             |    3 +-
 components/timeout/index.js                  |    2 +-
 data/crmfieldlookuptranslations.json         |  224 +++
 data/formsxml/planningappeals78.xml          | 1299 +++++-------------
 locales/cy/newappeal.json                    |   31 +-
 locales/en/newappeal.json                    |   31 +-
 pages/api/endpoint/getappealtypes_api.js     |    3 +-
 pages/api/endpoint/getmandatoryfields_api.js |    1 +
 pages/api/endpoint/updatecase_api.js         |    6 +-
 pages/newappeal/aboutyou.js                  |  137 ++
 store/appealType/action.js                   |    9 +
 store/appealType/reducer.js                  |    6 +
 store/formData/reducer.js                    |    2 +
 21 files changed, 2093 insertions(+), 1058 deletions(-)
 create mode 100644 components/newappeal/aboutyou.js
 create mode 100644 pages/newappeal/aboutyou.js

diff --git a/.env.local b/.env.local
index 8ecc16ae..4e0c3f45 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
 //ESNR Tenant
 TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
 //WGO Tenant
-TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
+//TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
 GRANT_TYPE = "client_credentials"
 
 HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
@@ -28,11 +28,11 @@ RELAYPATH = "dev-pedw-hc"
 
 
 //Preprod Oauth WGO
-CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
-CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
-RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
-RELAYURI = "pp-pedw-ns.servicebus.windows.net"
-RELAYPATH = "pp-pedw-hc"
+//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
+//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
+//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "pp-pedw-hc"
 
 
 
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js
index 85783cec..0e9982db 100644
--- a/components/breadcrumbs.js
+++ b/components/breadcrumbs.js
@@ -230,6 +230,53 @@ const Breadcrumbs = (props) => {
                         ) : (
                             ""
                         )}
+                        {router.pathname == "/newappeal/[appealtypes]" ? (
+                            <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale + "/myportal"
+                                                : "/myportal"
+                                        }
+                                    >
+                                        <a className="govuk-breadcrumbs__link">
+                                            {t("newappeal:parent-page-title")}
+                                        </a>
+                                    </Link>
+                                </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    {t("newappeal:page-title")}
+                                </li>
+                            </>
+                        ) : (
+                            ""
+                        )}
+                        {router.pathname == "/myportal/[appealtypes]" ? (
+                            <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale + "/myportal"
+                                                : "/myportal"
+                                        }
+                                    >
+                                        <a className="govuk-breadcrumbs__link">
+                                            {t("newappeal:parent-page-title")}
+                                        </a>
+                                    </Link>
+                                </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    {t("newappeal:page-title")}
+                                </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    {props.formTitle}
+                                </li>
+                            </>
+                        ) : (
+                            ""
+                        )}
                         {router.pathname == "/newappeal/selectappeal" ? (
                             <>
                                 <li className="govuk-breadcrumbs__list-item">
diff --git a/components/elements/index.js b/components/elements/index.js
index 9312d4bf..afde1d02 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -12,6 +12,17 @@ import pickListLookup from "../../data/picklistLookups.json";
 import useTranslation from "next-translate/useTranslation";
 import FileUpload from "../newappeal/fileupload";
 import Dropzone, { useDropzone } from "react-dropzone";
+import _ from "lodash";
+import { connect, useDispatch } from "react-redux";
+
+import {
+    addYears,
+    addMonths,
+    addDays,
+    subYears,
+    subMonths,
+    subDays,
+} from "date-fns";
 
 const RenderTextfield = ({
     id,
@@ -50,86 +61,204 @@ const RenderTextfield = ({
 };
 
 export function Textfield(props) {
-    const { name, label, validate, ticketnumber } = props;
+    const {
+        name,
+        label,
+        validation,
+        ticketnumber,
+        form,
+        formProps,
+        parentField,
+        parentFieldShowOnValue,
+        hint,
+    } = props;
     const required = (value) => (value ? undefined : "Required");
+
     if (name == "pinswg_name") {
+        let { t } = useTranslation();
+
         return (
-            <div className="govuk-form-group">
-                <label className="govuk-label " htmlFor={props.name}>
-                    {label}
-                </label>
-                <input
-                    type="text"
-                    name={name}
-                    id={props.name}
-                    component={RenderCaseID}
-                    value={ticketnumber}
-                    className="govuk-input  govuk-input--width-20"
-                    disabled
-                />
-            </div>
+            <>
+                <div className="govuk-form-group">
+                    <label className="govuk-label " htmlFor={props.name}>
+                        {label}
+                    </label>
+                    <input
+                        type="text"
+                        name={name}
+                        id={props.name}
+                        component={RenderCaseID}
+                        value={ticketnumber}
+                        className="govuk-input  govuk-input--width-20"
+                        disabled
+                    />
+                </div>
+                <div className="govuk-body">{t(hint)}</div>
+            </>
         );
     } else {
+        var showIfHasParentShowValue =
+            (parentField != false &&
+                !_.isEmpty(formProps[form]) &&
+                _.has(formProps[form].values, parentField) &&
+                formProps[form].values[parentField]) == parentFieldShowOnValue;
+
+        // console.log(parentField, showIfHasParentShowValue);
+        // console.log(parentField, formProps, form);
+
+        //console.log("validation props:", validation);
+
         return (
-            <Field
-                name={props.name}
-                id={props.name}
-                component={RenderTextfield}
-                type="text"
-                className="govuk-input govuk-input--width-20"
-                //validate={[required]}
-                label={props.label}
-                errorMsg="Is required"
-            />
+            <div className="govuk-form-group">
+                {parentField != false ? (
+                    showIfHasParentShowValue && (
+                        <Field
+                            name={props.name}
+                            id={props.name}
+                            component={RenderTextfield}
+                            type="text"
+                            className="govuk-input govuk-input--width-20"
+                            validate={eval(validation)}
+                            label={props.label}
+                            errorMsg="Is required"
+                        />
+                    )
+                ) : (
+                    <Field
+                        name={props.name}
+                        id={props.name}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={eval(validation)}
+                        label={props.label}
+                        errorMsg="Is required"
+                    />
+                )}
+            </div>
         );
     }
 }
 
 const RenderMultiline = ({
+    id,
     className,
     rows,
     datafieldname,
     name,
     label,
     input,
+    errorMsg,
     meta: { touched, error },
     ...custom
 }) => {
     return (
         <>
-            <textarea {...input} rows={rows} className={className}></textarea>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <label className="govuk-label " htmlFor={id} id={id + "_label"}>
+                    {FieldsTranslations(label)}
+                </label>
+                {touched && error && (
+                    <span id={id + "-error"} className="govuk-error-message">
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        {touched &&
+                            ((error && (
+                                <span>{errorMsg ? errorMsg : error}</span>
+                            )) ||
+                                (warning && <span>{warning}</span>))}
+                    </span>
+                )}
+                <textarea
+                    {...input}
+                    rows={rows}
+                    className={className}
+                ></textarea>
+            </div>
         </>
     );
 };
 
 export function MultiLinefield(props) {
-    const { name, label } = props;
+    const {
+        name,
+        label,
+        parentField,
+        form,
+        formProps,
+        parentFieldShowOnValue,
+        validation,
+    } = props;
+    const required = (value) => (value ? undefined : "Is required");
+
+    var showIfHasParentShowValue =
+        (parentField != false &&
+            !_.isEmpty(formProps[form]) &&
+            _.has(formProps[form].values, parentField) &&
+            formProps[form].values[parentField]) == parentFieldShowOnValue;
+
+    // console.log(parentField, showIfHasParentShowValue);
 
     return (
-        <div className="govuk-form-group">
-            <h1 className="govuk-label-wrapper">
-                <label className="govuk-label" htmlFor={props.name}>
-                    {FieldsTranslations(props.label)}
-                </label>
-            </h1>
-            <div
-                id={props.name + "-hint"}
-                className="govuk-hint govuk-!-font-size-14"
-            >
-                Do not include personal or financial information, like your
-                National Insurance number or credit card details.
-            </div>
+        <>
+            {parentField != false ? (
+                showIfHasParentShowValue && (
+                    <div>
+                        <h1 className="govuk-label-wrapper">
+                            <label className="govuk-label" htmlFor={props.name}>
+                                {FieldsTranslations(props.label)}
+                            </label>
+                        </h1>
+                        <div
+                            id={props.name + "-hint"}
+                            className="govuk-hint govuk-!-font-size-14"
+                        >
+                            Do not include personal or financial information.
+                        </div>
+                        <Field
+                            name={props.name}
+                            id={props.name}
+                            component={RenderMultiline}
+                            type="text"
+                            rows="5"
+                            className="govuk-textarea govuk-input--width-30"
+                            aria-describedby={props.name + "-hint"}
+                            validate={eval(validation)}
+                        />
+                    </div>
+                )
+            ) : (
+                <div className="govuk-form-group">
+                    <h1 className="govuk-label-wrapper">
+                        <label className="govuk-label" htmlFor={props.name}>
+                            {FieldsTranslations(props.label)}
+                        </label>
+                    </h1>
+                    <div
+                        id={props.name + "-hint"}
+                        className="govuk-hint govuk-!-font-size-14"
+                    >
+                        Do not include personal or financial information.
+                    </div>
 
-            <Field
-                name={props.name}
-                id={props.name}
-                component={RenderMultiline}
-                type="text"
-                rows="5"
-                className="govuk-textarea govuk-input--width-30"
-                aria-describedby={props.name + "-hint"}
-            />
-        </div>
+                    <Field
+                        name={props.name}
+                        id={props.name}
+                        component={RenderMultiline}
+                        type="text"
+                        rows="5"
+                        className="govuk-textarea govuk-input--width-30"
+                        aria-describedby={props.name + "-hint"}
+                        validate={eval(validation)}
+                    />
+                </div>
+            )}
+        </>
     );
 }
 
@@ -145,6 +274,42 @@ const RenderDatePicker = ({
 }) => {
     const router = useRouter();
     registerLocale("cy", cy);
+
+    var startDateArr =
+        custom.dateStart != "0" ? custom.dateStart.split("") : custom.dateStart;
+    var endDateArr =
+        custom.dateEnd != "0" ? custom.dateEnd.split("") : custom.dateEnd;
+
+    var minDate =
+        startDateArr == 0
+            ? new Date()
+            : startDateArr[0] == "-"
+            ? startDateArr[2] == "y"
+                ? subYears(new Date(), startDateArr[1])
+                : startDateArr[2] == "m"
+                ? subMonths(new Date(), startDateArr[1])
+                : subDays(new Date(), startDateArr[1])
+            : startDateArr[2] == "y"
+            ? addYears(new Date(), startDateArr[1])
+            : startDateArr[2] == "m"
+            ? addMonths(new Date(), startDateArr[1])
+            : addDays(new Date(), startDateArr[1]);
+
+    var maxDate =
+        endDateArr == 0
+            ? new Date()
+            : startDateArr[0] == "-"
+            ? startDateArr[2] == "y"
+                ? subYears(new Date(), startDateArr[1])
+                : startDateArr[2] == "m"
+                ? subMonths(new Date(), startDateArr[1])
+                : subDays(new Date(), startDateArr[1])
+            : startDateArr[2] == "y"
+            ? addYears(new Date(), startDateArr[1])
+            : startDateArr[2] == "m"
+            ? addMonths(new Date(), startDateArr[1])
+            : addDays(new Date(), startDateArr[1]);
+
     return (
         <>
             <div
@@ -185,6 +350,9 @@ const RenderDatePicker = ({
                         dateFormat="dd/MM/yyyy"
                         onChange={onChange}
                         selected={value || null}
+                        className="govuk-input govuk-input--width-10"
+                        minDate={minDate}
+                        maxDate={maxDate}
 
                         // value={!value ? null : new Date(value)}
                     />
@@ -195,18 +363,53 @@ const RenderDatePicker = ({
 };
 
 export function DateFieldPicker(props) {
-    const { name, label } = props;
+    const {
+        name,
+        label,
+        parentField,
+        form,
+        formProps,
+        parentFieldShowOnValue,
+        validation,
+        dateStart,
+        dateEnd,
+    } = props;
     const required = (value) => (value ? undefined : "Required");
 
+    var showIfHasParentShowValue =
+        (parentField != false &&
+            !_.isEmpty(formProps[form]) &&
+            _.has(formProps[form].values, parentField) &&
+            formProps[form].values[parentField]) == parentFieldShowOnValue;
+
     return (
-        <Field
-            name={name}
-            id={name}
-            label={label}
-            component={RenderDatePicker}
-            //validate={[required]}
-            errorMsg="Select a date"
-        />
+        <div className="govuk-form-group">
+            {parentField != false ? (
+                showIfHasParentShowValue && (
+                    <Field
+                        name={name}
+                        id={name}
+                        label={label}
+                        component={RenderDatePicker}
+                        validate={eval(validation)}
+                        errorMsg="Select a date"
+                        dateStart={dateStart}
+                        dateEnd={dateEnd}
+                    />
+                )
+            ) : (
+                <Field
+                    name={name}
+                    id={name}
+                    label={label}
+                    component={RenderDatePicker}
+                    validate={eval(validation)}
+                    errorMsg="Select a date"
+                    dateStart={dateStart}
+                    dateEnd={dateEnd}
+                />
+            )}
+        </div>
     );
 }
 
@@ -332,7 +535,13 @@ const RenderYesNo = ({
                             {errorMsg}
                         </span>
                     )}
-                    <div className="govuk-radios govuk-radios--inline govuk-radios--small">
+                    <div
+                        className={
+                            custom.inline == false
+                                ? "govuk-radios govuk-radios--small"
+                                : "govuk-radios govuk-radios--inline govuk-radios--small"
+                        }
+                    >
                         {Object.keys(options).map((key, index) => (
                             <div
                                 className="govuk-radios__item"
@@ -346,6 +555,31 @@ const RenderYesNo = ({
                                     type="radio"
                                     className="govuk-radios__input"
                                     value={options[key]}
+                                    onChange={(e) => {
+                                        let docListObj = custom.documentList;
+                                        if (
+                                            custom.requiredDocumentValue ==
+                                                "Yes" ||
+                                            custom.requiredDocumentValue ==
+                                                "Ydw"
+                                        ) {
+                                            e.target.value == "Ydw" ||
+                                            e.target.value == "Yes"
+                                                ? (docListObj = Object.assign(
+                                                      docListObj,
+                                                      {
+                                                          ["documentCheckList_" +
+                                                          id]:
+                                                              custom.requiredDocumentLabel,
+                                                      }
+                                                  ))
+                                                : delete docListObj[
+                                                      "documentCheckList_" + id
+                                                  ];
+                                            console.log(docListObj);
+                                            custom.setDocumentsList(docListObj);
+                                        }
+                                    }}
                                 />
                                 <label
                                     className="govuk-label govuk-radios__label"
@@ -365,7 +599,7 @@ const RenderYesNo = ({
 export function YesNofield(props) {
     const router = useRouter();
 
-    const { name, label } = props;
+    const { name, label, inline, validation } = props;
     const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
     const required = (value) => (value ? undefined : "Required");
 
@@ -376,10 +610,291 @@ export function YesNofield(props) {
             label={props.label}
             options={yesNo}
             id={props.name}
-            className="govuk-radios__input"
-            //validate={[required]}
+            className={"govuk-radios__input"}
+            validate={eval(validation)}
             errorMsg="Select an option"
             component={RenderYesNo}
+            inline={_.has(props, "inline") ? props.inline : "true"}
+            requiredDocumentLabel={props.requiredDocumentLabel}
+            requiredDocumentValue={props.requiredDocumentValue}
+            setDocumentsList={props.setDocumentsList}
+            documentList={props.documentList}
+        />
+    );
+}
+
+const RenderRadio = ({
+    datafieldname,
+    name,
+    label,
+    id,
+    errorMsg,
+    options,
+    input: { onChange, value },
+    meta: { touched, error },
+    ...custom
+}) => {
+    let { t } = useTranslation();
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <fieldset
+                    className="govuk-fieldset"
+                    aria-describedby={name + "-hint"}
+                >
+                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
+                        <label
+                            className="govuk-fieldset__heading govuk-body-m"
+                            id={id + "_label"}
+                        >
+                            {FieldsTranslations(label)}
+                        </label>
+                    </legend>
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {errorMsg}
+                        </span>
+                    )}
+                    <div
+                        className={
+                            custom.inline == false
+                                ? "govuk-radios govuk-radios--small"
+                                : "govuk-radios govuk-radios--inline govuk-radios--small"
+                        }
+                    >
+                        {" "}
+                        {custom.hint != false && (
+                            <div class="govuk-hint">{t(custom.hint)}</div>
+                        )}
+                        {Object.keys(options).map((key, index) => (
+                            <div
+                                className="govuk-radios__item"
+                                data-children-count={key}
+                                key={key}
+                            >
+                                <Field
+                                    id={id + "_" + index}
+                                    name={id}
+                                    component="input"
+                                    type="radio"
+                                    className="govuk-radios__input"
+                                    value={options[key].split("|")[0]}
+                                    onChange={(e) => {
+                                        let docListObj = custom.documentList;
+                                        if (
+                                            custom.requiredDocumentValue ==
+                                            "Yes"
+                                        ) {
+                                            e.target.value != "846040000"
+                                                ? (docListObj = Object.assign(
+                                                      docListObj,
+                                                      {
+                                                          ["documentCheckList_" +
+                                                          id]:
+                                                              custom.requiredDocumentLabel,
+                                                      }
+                                                  ))
+                                                : delete docListObj[
+                                                      "documentCheckList_" + id
+                                                  ];
+                                            custom.setDocumentsList(docListObj);
+                                        }
+                                    }}
+                                />
+                                <label
+                                    className="govuk-label govuk-radios__label"
+                                    htmlFor={id + "_" + index}
+                                >
+                                    {t(options[key].split("|")[1])}
+                                </label>
+                            </div>
+                        ))}
+                    </div>
+                </fieldset>
+            </div>
+        </>
+    );
+};
+
+export function Radiofield(props) {
+    const {
+        name,
+        label,
+        datafieldname,
+        parentField,
+        form,
+        formProps,
+        parentFieldShowOnValue,
+        validation,
+    } = props;
+
+    const router = useRouter();
+    const required = (value) => (value ? undefined : "Required");
+    // console.log(props.options);
+
+    const fieldOptions = props.options
+        .slice(1, props.options.length - 1)
+        .split(",");
+
+    //parentFieldShowOnValue
+    var showIfHasParentShowValue =
+        parentField != false &&
+        !_.isEmpty(formProps[form]) &&
+        _.has(formProps[form].values, parentField) &&
+        parentFieldShowOnValue.indexOf(
+            formProps[form].values[parentField].toString()
+        ) > -1;
+
+    // console.log(showIfHasParentShowValue);
+
+    return (
+        <>
+            {parentField != false ? (
+                showIfHasParentShowValue && (
+                    <Field
+                        name={name}
+                        datafieldname={datafieldname}
+                        label={label}
+                        options={fieldOptions}
+                        id={name}
+                        //validate={[required]}
+                        errorMsg="Select an option"
+                        component={RenderRadio}
+                        inline={props.inline}
+                        hint={props.hint}
+                        validate={eval(validation)}
+                        requiredDocumentLabel={props.requiredDocumentLabel}
+                        requiredDocumentValue={props.requiredDocumentValue}
+                        setDocumentsList={props.setDocumentsList}
+                        documentList={props.documentList}
+                    />
+                )
+            ) : (
+                <Field
+                    name={name}
+                    datafieldname={datafieldname}
+                    label={label}
+                    options={fieldOptions}
+                    id={name}
+                    //validate={[required]}
+                    errorMsg="Select an option"
+                    component={RenderRadio}
+                    inline={props.inline}
+                    hint={props.hint}
+                    validate={eval(validation)}
+                    requiredDocumentLabel={props.requiredDocumentLabel}
+                    requiredDocumentValue={props.requiredDocumentValue}
+                    setDocumentsList={props.setDocumentsList}
+                    documentList={props.documentList}
+                />
+            )}
+        </>
+    );
+}
+
+const RenderCheckBox = ({
+    datafieldname,
+    name,
+    label,
+    id,
+    errorMsg,
+    options,
+    input: { onChange, value },
+    meta: { touched, error },
+    ...custom
+}) => {
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <fieldset
+                    className="govuk-fieldset"
+                    aria-describedby={name + "-hint"}
+                >
+                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
+                        <label
+                            className="govuk-fieldset__heading govuk-body-m"
+                            id={id + "_label"}
+                        >
+                            {FieldsTranslations(label)}
+                        </label>
+                    </legend>
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {errorMsg}
+                        </span>
+                    )}
+                    <div className="govuk-checkboxes ">
+                        {Object.keys(options).map((key, index) => (
+                            <div
+                                className="govuk-checkboxes__item"
+                                data-children-count={key}
+                                key={key}
+                            >
+                                <Field
+                                    id={id + "_" + index}
+                                    name={id + "_" + index}
+                                    component="input"
+                                    type="checkbox"
+                                    className="govuk-checkboxes__input"
+                                    value={options[key]}
+                                />
+                                <label
+                                    className="govuk-label govuk-checkboxes__label"
+                                    htmlFor={id + "_" + index}
+                                >
+                                    {options[key]}
+                                </label>
+                            </div>
+                        ))}
+                    </div>
+                </fieldset>
+            </div>
+        </>
+    );
+};
+
+export function CheckBoxfield(props) {
+    const router = useRouter();
+
+    console.log(props);
+    const required = (value) => (value ? undefined : "Required");
+    const fieldOptions =
+        router.locale == "cy" ? ["Ydw", "Na", "2323"] : ["Yes", "No", "23232"];
+    return (
+        <Field
+            name={props.name}
+            datafieldname={props.datafieldname}
+            label={props.label}
+            options={fieldOptions}
+            id={props.id}
+            className={props.className}
+            //validate={[required]}
+            errorMsg="Select an option"
+            component={RenderCheckBox}
         />
     );
 }
@@ -438,7 +953,8 @@ export function PickList(props) {
 }
 
 export function NumericField(props) {
-    const { name, label } = props;
+    const { name, label, validation } = props;
+    const required = (value) => (value ? undefined : "Required");
 
     return (
         <div className="govuk-form-group">
@@ -448,7 +964,6 @@ export function NumericField(props) {
             <Field
                 name={props.name}
                 id={props.name}
-                component="input"
                 type="number"
                 className="govuk-input  govuk-input--width-20"
                 spellCheck="false"
@@ -456,13 +971,16 @@ export function NumericField(props) {
                 pattern="[0-9]*"
                 inputMode="numeric"
                 parse={Number}
+                validate={eval(validation)}
+                component={RenderTextfield}
             />
         </div>
     );
 }
 
 export function DecimalField(props) {
-    const { name, label } = props;
+    const { name, label, validation } = props;
+    const required = (value) => (value ? undefined : "Required");
 
     return (
         <div className="govuk-form-group">
@@ -472,7 +990,7 @@ export function DecimalField(props) {
             <Field
                 name={props.name}
                 id={props.name}
-                component="input"
+                // component="input"
                 type="number"
                 className="govuk-input govuk-input--width-10"
                 spellCheck="false"
@@ -480,6 +998,8 @@ export function DecimalField(props) {
                 pattern="[0-9]*"
                 inputMode="numeric"
                 parse={Number}
+                validate={eval(validation)}
+                component={RenderTextfield}
             />
         </div>
     );
@@ -491,24 +1011,26 @@ export function ReadOnlyfield(props) {
     const { name, label, value } = props;
     //console.log(props.value.refno);
     return (
-        <div className="govuk-form-group">
-            <label className="govuk-label " htmlFor={props.name}>
-                {FieldsTranslations(props.label)}
-            </label>
-            <input
-                type="text"
-                name={props.name}
-                id={props.name}
-                component={RenderCaseID}
-                value={value}
-                className="govuk-input  govuk-input--width-20"
-                disabled
-            />
-        </div>
+        <>
+            <div className="govuk-form-group">
+                <label className="govuk-label " htmlFor={props.name}>
+                    {FieldsTranslations(props.label)}
+                </label>
+                <input
+                    type="text"
+                    name={props.name}
+                    id={props.name}
+                    component={RenderCaseID}
+                    value={value}
+                    className="govuk-input  govuk-input--width-20"
+                    disabled
+                />
+            </div>
+        </>
     );
 }
 
-const FieldsTranslations = (label) => {
+export const FieldsTranslations = (label) => {
     const router = useRouter();
     const { locale } = router;
     const { appealtypes } = router.query;
diff --git a/components/homepage/login.js b/components/homepage/login.js
index 26994319..c503c47a 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -207,7 +207,7 @@ let Login = (props) => {
                 <h3 className="heading-small card-heading">
                     {t("home:login-card-title")}
                 </h3>{" "}
-                {/* <form onSubmit={handleSubmit(onHandleSubmit)}>
+                <form onSubmit={handleSubmit(onHandleSubmit)}>
                     {validLoginID == false && (
                         <div className="govuk-error-message govuk-form-group--error">
                             Incorrect username or password
@@ -254,7 +254,7 @@ let Login = (props) => {
                             {t("home:login-card-button")}
                         </button>
                     </div>
-                </form> */}
+                </form>
                 <div className="govuk-form-group govuk-!-margin-top-4">
                     <p className="govuk-body-xs">
                         <a
diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
new file mode 100644
index 00000000..99ee6288
--- /dev/null
+++ b/components/newappeal/aboutyou.js
@@ -0,0 +1,448 @@
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { Field, formValueSelector, reduxForm } from "redux-form";
+
+let AboutYou = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+
+    const { onSubmit, handleSubmit, appellantAgentValue } = props;
+
+    const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
+    const appellantAgent =
+        router.locale == "cy" ? ["Apelydd", "Asiant"] : ["Appellant", "Agent"];
+    const contactPref =
+        router.locale == "cy" ? ["Ebost", "Post"] : ["Email", "Post"];
+
+    const required = (value) => (value ? undefined : "Is required");
+    const emailRegex =
+        /(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;
+
+    const email = (value) =>
+        value && !emailRegex.test(value) ? "Invalid email address" : undefined;
+    const phoneNumber = (value) =>
+        value &&
+        !/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/i.test(
+            value
+        )
+            ? "Invalid phone number"
+            : undefined;
+
+    const RenderTextfield = ({
+        id,
+        className,
+        rows,
+        datafieldname,
+        name,
+        label,
+        input,
+        type,
+        errorMsg,
+        disabled,
+        meta: { touched, error },
+        ...custom
+    }) => {
+        return (
+            <>
+                <div
+                    className={
+                        touched && error
+                            ? "govuk-form-group govuk-form-group--error"
+                            : "govuk-form-group "
+                    }
+                >
+                    <label
+                        className="govuk-label "
+                        htmlFor={id}
+                        id={id + "_label"}
+                    >
+                        {label}
+                    </label>
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {touched &&
+                                ((error && (
+                                    <span>{errorMsg ? errorMsg : error}</span>
+                                )) ||
+                                    (warning && <span>{warning}</span>))}
+                        </span>
+                    )}
+                    <input
+                        {...input}
+                        className={className}
+                        name={id}
+                        id={id}
+                        type={type}
+                        disabled={disabled ? true : false}
+                    />
+                </div>
+            </>
+        );
+    };
+
+    const RenderYesNo = ({
+        datafieldname,
+        name,
+        label,
+        id,
+        errorMsg,
+        options,
+        input: { onChange, value },
+        meta: { touched, error },
+        ...custom
+    }) => {
+        return (
+            <>
+                <div
+                    className={
+                        touched && error
+                            ? "govuk-form-group govuk-form-group--error"
+                            : "govuk-form-group "
+                    }
+                >
+                    <fieldset
+                        className="govuk-fieldset"
+                        aria-describedby={name + "-hint"}
+                    >
+                        <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
+                            <label
+                                className="govuk-fieldset__heading govuk-body-m"
+                                id={id + "_label"}
+                            >
+                                {label}
+                            </label>
+                        </legend>
+                        {touched && error && (
+                            <span
+                                id={id + "-error"}
+                                className="govuk-error-message"
+                            >
+                                <span className="govuk-visually-hidden">
+                                    Error:
+                                </span>{" "}
+                                {errorMsg}
+                            </span>
+                        )}
+                        <div className="govuk-radios govuk-radios--inline govuk-radios--small">
+                            {Object.keys(options).map((key, index) => (
+                                <div
+                                    className="govuk-radios__item"
+                                    data-children-count={key}
+                                    key={key}
+                                >
+                                    <Field
+                                        id={id + "_" + index}
+                                        name={id}
+                                        component="input"
+                                        type="radio"
+                                        className="govuk-radios__input"
+                                        value={options[key]}
+                                    />
+                                    <label
+                                        className="govuk-label govuk-radios__label"
+                                        htmlFor={id + "_" + index}
+                                    >
+                                        {options[key]}
+                                    </label>
+                                </div>
+                            ))}
+                        </div>
+                    </fieldset>
+                </div>
+            </>
+        );
+    };
+
+    const onHandleSubmit = (values) => {
+        event.preventDefault();
+
+        console.log(values);
+        router.replace("/newappeal");
+    };
+    return (
+        <form onSubmit={handleSubmit(onHandleSubmit)}>
+            <Field
+                name={"onbehalfof"}
+                id={"onbehalfof"}
+                component={RenderTextfield}
+                type="text"
+                className="govuk-input govuk-input--width-20"
+                validate={[required]}
+                label={t("newappeal:about-you-on-behalf-label")}
+            />
+            <div className="govuk-form-group">
+                <details class="govuk-details" data-module="govuk-details">
+                    <summary class="govuk-details__summary">
+                        <span class="govuk-details__summary-text">
+                            Who can appeal?
+                        </span>
+                    </summary>
+                    <div class="govuk-details__text">
+                        Only those named as an applicant on the original
+                        application form can submit an appeal. if you are
+                        submitting an appeal on behalf of a company state the
+                        name of the company you are representing,
+                    </div>
+                </details>
+            </div>
+            <Field
+                name={"appellantAgent"}
+                datafieldname={"appellantAgent"}
+                label={t("newappeal:about-you-who-are-you-label")}
+                options={appellantAgent}
+                id={"appellantAgent"}
+                className="govuk-radios__input"
+                validate={[required]}
+                errorMsg="Select an option"
+                component={RenderYesNo}
+            />
+            {(appellantAgentValue == "Appellant" ||
+                appellantAgentValue == "Apelydd") && (
+                <>
+                    <h2 className="govuk-heading-s">
+                        {t("newappeal:about-you-appellant-contact-details")}
+                    </h2>
+                    <Field
+                        name={"appellantfirstname"}
+                        id={"appellantfirstname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-firstname-label"
+                        )}
+                    />
+                    <Field
+                        name={"appellantlastname"}
+                        id={"appellantlastname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-lastname-label"
+                        )}
+                    />{" "}
+                    <Field
+                        name={"appellantemailaddress"}
+                        id={"appellantemailaddress"}
+                        component={RenderTextfield}
+                        type="email"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required, email]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-email-label"
+                        )}
+                    />
+                    <Field
+                        name={"appellantphonenumber"}
+                        id={"appellantphonenumber"}
+                        component={RenderTextfield}
+                        type="numberz"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required, phoneNumber]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-phone-label"
+                        )}
+                    />
+                    <Field
+                        name={"contactPrefs"}
+                        datafieldname={"contactPrefs"}
+                        label={t(
+                            "newappeal:about-you-agent-contact-preferences-label"
+                        )}
+                        options={contactPref}
+                        id={"contactPrefs"}
+                        className="govuk-radios__input"
+                        //validate={[required]}
+                        errorMsg="Select an option"
+                        component={RenderYesNo}
+                    />
+                </>
+            )}
+            {(appellantAgentValue == "Agent" ||
+                appellantAgentValue == "Asiant") && (
+                <>
+                    <h2 className="govuk-heading-s">
+                        {t("newappeal:about-you-appellant-contact-details")}
+                    </h2>
+                    <Field
+                        name={"appellantfirstname"}
+                        id={"appellantfirstname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-firstname-label"
+                        )}
+                    />
+                    <Field
+                        name={"appellantlastname"}
+                        id={"appellantlastname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-lastname-label"
+                        )}
+                    />{" "}
+                    <Field
+                        name={"appellantemailaddress"}
+                        id={"appellantemailaddress"}
+                        component={RenderTextfield}
+                        type="email"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required, email]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-email-label"
+                        )}
+                    />
+                    <Field
+                        name={"appellantphonenumber"}
+                        id={"appellantphonenumber"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-appellant-contact-details-phone-label"
+                        )}
+                    />
+                    <h2 className="govuk-heading-s">
+                        {t("newappeal:about-you-agent-contact-details")}
+                    </h2>{" "}
+                    <Field
+                        name={"agentcompanyname"}
+                        id={"agentcompanyname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-agent-contact-details-companyname-label"
+                        )}
+                    />
+                    <Field
+                        name={"agentfirstname"}
+                        id={"agentfirstname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-agent-contact-details-firstname-label"
+                        )}
+                    />
+                    <Field
+                        name={"agentlastname"}
+                        id={"agentlastname"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required]}
+                        label={t(
+                            "newappeal:about-you-agent-contact-details-lastname-label"
+                        )}
+                    />{" "}
+                    <Field
+                        name={"agentemailaddress"}
+                        id={"agentemailaddress"}
+                        component={RenderTextfield}
+                        type="text"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required, email]}
+                        label={t(
+                            "newappeal:about-you-agent-contact-details-email-label"
+                        )}
+                    />
+                    <Field
+                        name={"agentphonenumber"}
+                        id={"agentphonenumber"}
+                        component={RenderTextfield}
+                        type="number"
+                        className="govuk-input govuk-input--width-20"
+                        validate={[required, phoneNumber]}
+                        label={t(
+                            "newappeal:about-you-agent-contact-details-phone-label"
+                        )}
+                    />
+                    <Field
+                        name={"contactPrefs"}
+                        datafieldname={"contactPrefs"}
+                        label={t(
+                            "newappeal:about-you-agent-contact-preferences-label"
+                        )}
+                        options={contactPref}
+                        id={"contactPrefs"}
+                        className="govuk-radios__input"
+                        //validate={[required]}
+                        errorMsg="Select an option"
+                        component={RenderYesNo}
+                    />
+                </>
+            )}
+
+            <button
+                type="submit"
+                className="govuk-button"
+                data-module="govuk-button"
+            >
+                {t("common:continue-button")}
+            </button>
+        </form>
+    );
+};
+
+const mapStateToProps = (state) => {
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        //form: state.form,
+    };
+};
+
+const mapDispatchToProps = (dispatch) => {
+    return {};
+};
+
+AboutYou = reduxForm({
+    form: "caseForm", // a unique identifier for this form
+    destroyOnUnmount: false,
+})(AboutYou);
+
+const selector = formValueSelector("caseForm"); // <-- same as form name
+
+AboutYou = connect((state) => {
+    // can select values individually
+    const appellantAgentValue = selector(state, "appellantAgent");
+
+    return {
+        appellantAgentValue,
+    };
+})(AboutYou);
+
+export default AboutYou;
+
+// export default connect(
+//     mapStateToProps,
+//     mapDispatchToProps
+// )(
+//     reduxForm({
+//         form: "caseForm",
+//         destroyOnUnmount: false,
+//     })(AboutYou)
+// );
diff --git a/components/newappeal/buildfield.js b/components/newappeal/buildfield.js
index 2cc60696..c38e958a 100644
--- a/components/newappeal/buildfield.js
+++ b/components/newappeal/buildfield.js
@@ -5,7 +5,6 @@ import xpath from "xpath";
 
 import {
     Textfield,
-    DateField,
     DateFieldPicker,
     YesNofield,
     PickList,
@@ -14,6 +13,8 @@ import {
     ReadOnlyfield,
     DecimalField,
     FileUploadField,
+    CheckBoxfield,
+    Radiofield,
 } from "../elements";
 
 export default function BuildField(props) {
@@ -26,9 +27,11 @@ export default function BuildField(props) {
 
     const parser = new DOMParser();
 
-    console.log(props);
+    //console.log(props);
 
     const whichFieldType = (classid) => {
+        //console.log(props.datafieldname, classid);
+
         switch (classid) {
             case "{270BD3DB-D9AF-4782-9025-509E298DEC0A}":
                 return (
@@ -54,6 +57,7 @@ export default function BuildField(props) {
                         label={props.label}
                         datafieldname={props.datafieldname}
                         picklistData={props.picklistData}
+                        validation={props.validation}
                     />
                 );
                 break;
@@ -62,10 +66,38 @@ export default function BuildField(props) {
                     <YesNofield
                         name={props.datafieldname}
                         label={props.label}
+                        requiredDocumentValue={props.requiredDocumentValue}
+                        requiredDocumentLabel={props.requiredDocumentLabel}
+                        validation={props.validation}
+                        setDocumentsList={props.setDocumentsList}
+                        documentList={props.documentList}
+                    />
+                );
+                break;
+            case "{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}":
+                return (
+                    <Radiofield
+                        name={props.datafieldname}
+                        label={props.label}
+                        datafieldname={props.datafieldname}
+                        options={props.datafieldcontent}
+                        inline={false}
+                        hint={props.hint}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
+                        validation={props.validation}
+                        setDocumentsList={props.setDocumentsList}
+                        documentList={props.documentList}
+                        requiredDocumentValue={props.requiredDocumentValue}
+                        requiredDocumentLabel={props.requiredDocumentLabel}
                     />
                 );
                 break;
             case "{4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
+                const required = (value) => (value ? undefined : "Is required");
+
                 return (
                     <Textfield
                         name={props.datafieldname}
@@ -75,6 +107,12 @@ export default function BuildField(props) {
                             props.props.props.appealType.caseReference
                                 .ticketnumber
                         }
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
+                        validation={props.validation}
+                        hint={props.hint}
                     />
                 );
                 break;
@@ -83,6 +121,13 @@ export default function BuildField(props) {
                     <DateFieldPicker
                         name={props.datafieldname}
                         label={props.label}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
+                        validation={props.validation}
+                        dateStart={props.dateStart}
+                        dateEnd={props.dateEnd}
                     />
                 );
                 break;
@@ -91,6 +136,11 @@ export default function BuildField(props) {
                     <MultiLinefield
                         name={props.datafieldname}
                         label={props.label}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
+                        validation={props.validation}
                     />
                 );
                 break;
@@ -99,6 +149,7 @@ export default function BuildField(props) {
                     <NumericField
                         name={props.datafieldname}
                         label={props.label}
+                        validation={props.validation}
                     />
                 );
                 break;
@@ -107,6 +158,7 @@ export default function BuildField(props) {
                     <DecimalField
                         name={props.datafieldname}
                         label={props.label}
+                        validation={props.validation}
                     />
                 );
                 break;
@@ -118,6 +170,21 @@ export default function BuildField(props) {
                     />
                 );
                 break;
+
+            case "{9EF39988-22BB-4f0b-BBBE-64B5A3748AEE}":
+                return (
+                    <CheckBoxfield
+                        name={props.datafieldname}
+                        label={props.label}
+                        props={props}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
+                        validation={props.validation}
+                    />
+                );
+                break;
             default:
                 return (
                     <Textfield name={props.datafieldname} label={props.label} />
diff --git a/components/newappeal/buildrow.js b/components/newappeal/buildrow.js
index 80249e3e..f37d0c6b 100644
--- a/components/newappeal/buildrow.js
+++ b/components/newappeal/buildrow.js
@@ -35,9 +35,61 @@ export default function BuildRow(props) {
                 } else {
                     var rows = xpath.select("//label/@description", doc);
                     var fieldtype = xpath.select("//@classid", doc);
+                    var validation = xpath.select("//@validation", doc);
                     var datafieldname = xpath.select("//@datafieldname", doc);
+                    var datafieldcontent = xpath.select(
+                        "//@datafieldcontent",
+                        doc
+                    );
+                    var parentField = xpath.select("//@parentField", doc);
 
-                    console.log(doc, datafieldname[0].value);
+                    var parentFieldShowOnValue = xpath.select(
+                        "//@parentFieldShowOnValue",
+                        doc
+                    );
+
+                    var requiredDocumentValue = xpath.select(
+                        "//@requiredDocumentValue",
+                        doc
+                    );
+
+                    var requiredDocumentLabel = xpath.select(
+                        "//@requiredDocumentLabel",
+                        doc
+                    );
+
+                    var hint = xpath.select("//label/@hint", doc);
+                    var dateStart = xpath.select("//@dateStart", doc);
+                    var dateEnd = xpath.select("//@dateEnd", doc);
+
+                    hint = !_.isEmpty(hint) && hint[0].value;
+
+                    validation = !_.isEmpty(validation)
+                        ? validation[0].value
+                        : [];
+
+                    parentField =
+                        !_.isEmpty(parentField) && parentField[0].value;
+
+                    parentFieldShowOnValue =
+                        !_.isEmpty(parentFieldShowOnValue) &&
+                        parentFieldShowOnValue[0].value;
+
+                    datafieldcontent =
+                        !_.isEmpty(datafieldcontent) &&
+                        datafieldcontent[0].value;
+
+                    requiredDocumentValue =
+                        !_.isEmpty(requiredDocumentValue) &&
+                        requiredDocumentValue[0].value;
+
+                    requiredDocumentLabel =
+                        !_.isEmpty(requiredDocumentLabel) &&
+                        requiredDocumentLabel[0].value;
+
+                    dateStart = !_.isEmpty(dateStart) && dateStart[0].value;
+
+                    dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value;
 
                     const isRequiredField = jsonpath.query(
                         mandatoryFieldsData,
@@ -61,15 +113,25 @@ export default function BuildRow(props) {
                             />
                         );
                     } else {
+                        // console.log(
+                        //     datafieldname[0].value,
+                        //     isRequiredField[0].RequiredLevel.Value
+                        // );
                         if (typeof isRequiredField[0] != "undefined") {
                             if (
                                 isRequiredField[0].RequiredLevel.Value != "None"
                             ) {
+                                //console.log(datafieldname[0].value, validation);
                                 return (
                                     <BuildField
                                         fieldType={fieldtype[0].value}
                                         label={rows[0].value}
                                         datafieldname={datafieldname[0].value}
+                                        datafieldcontent={datafieldcontent}
+                                        parentField={parentField}
+                                        parentFieldShowOnValue={
+                                            parentFieldShowOnValue
+                                        }
                                         key={key}
                                         props={props}
                                         picklistData={
@@ -79,6 +141,22 @@ export default function BuildRow(props) {
                                         mandatoryFieldsData={
                                             mandatoryFieldsData
                                         }
+                                        hint={hint}
+                                        requiredDocumentLabel={
+                                            requiredDocumentLabel
+                                        }
+                                        requiredDocumentValue={
+                                            requiredDocumentValue
+                                        }
+                                        validation={validation}
+                                        dateStart={dateStart}
+                                        dateEnd={dateEnd}
+                                        setDocumentsList={
+                                            props.props.setDocumentsList
+                                        }
+                                        documentList={
+                                            props.props.appealType.documentList
+                                        }
                                     />
                                 );
                             } else {
diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js
index ad15ac5d..57cf7228 100644
--- a/components/newappeal/buildsection.js
+++ b/components/newappeal/buildsection.js
@@ -10,7 +10,11 @@ import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
 import {
     setCaseReference,
     setCurrentSection,
+    setDocumentsList,
 } from "../../store/appealType/action";
+
+import { FieldsTranslations } from "../elements";
+
 import { query } from "jsonpath";
 
 let BuildSection = (props) => {
@@ -35,6 +39,7 @@ let BuildSection = (props) => {
         mandatoryFieldsData,
     } = props;
 
+    const documentListObj = props.appealType.documentList;
     const currentSection = props.appealType.currentSection;
     const parser = new DOMParser();
     var doc = parser.parseFromString(props.formXML, "text/xml");
@@ -131,8 +136,7 @@ let BuildSection = (props) => {
         <div className="govuk-grid-row">
             <div className="govuk-grid-column-two-thirds">
                 <h1 className="govuk-heading-m  govuk-!-margin-top-5">
-                    {/* {titles[0].value}{" "} */}
-                    Enter your appeal information
+                    {titles[0].value}
                 </h1>
                 <form onSubmit={handleSubmit(onHandleSubmit)}>
                     {hasErrors == true ? (
@@ -200,7 +204,7 @@ let BuildSection = (props) => {
                     className="at-nav"
                 >
                     <h3 className="govuk-heading-s govuk-!-font-weight-bold gov-font-dark-grey">
-                        Progress:
+                        {t("newappeal:new-appeal-progress-nav-label")}:
                     </h3>
                     <hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
 
@@ -211,7 +215,11 @@ let BuildSection = (props) => {
                                     {Object.keys(titleList).map((key) =>
                                         parseInt(key) + 1 == currentSection ? (
                                             <li key={key}>
-                                                <b>{titleList[key].value} </b>
+                                                <b>
+                                                    {FieldsTranslations(
+                                                        titleList[key].value
+                                                    )}{" "}
+                                                </b>
                                             </li>
                                         ) : (
                                             <li key={key}>
@@ -229,10 +237,14 @@ let BuildSection = (props) => {
                                                             );
                                                         }}
                                                     >
-                                                        {titleList[key].value}
+                                                        {FieldsTranslations(
+                                                            titleList[key].value
+                                                        )}
                                                     </a>
                                                 ) : (
-                                                    titleList[key].value
+                                                    FieldsTranslations(
+                                                        titleList[key].value
+                                                    )
                                                 )}
                                             </li>
                                         )
@@ -242,6 +254,28 @@ let BuildSection = (props) => {
                         </ul>
                     </ol>
                 </nav>
+
+                {Object.keys(documentListObj).length > 0 && (
+                    <div>
+                        <h3 className="govuk-heading-s govuk-!-font-weight-bold gov-font-dark-grey">
+                            {t("newappeal:new-appeal-documentlist-nav")}:
+                        </h3>
+                        <hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
+                        <ol className="govuk-list document-list">
+                            <ul className="govuk-list ">
+                                <li className="at-nav__page">
+                                    <ol className="govuk-list govuk-list--bullet">
+                                        {Object.entries(documentListObj).map(
+                                            ([key, value]) => {
+                                                return <li>{value}</li>;
+                                            }
+                                        )}
+                                    </ol>
+                                </li>
+                            </ul>
+                        </ol>
+                    </div>
+                )}
             </div>
         </div>
     );
@@ -265,6 +299,9 @@ const mapDispatchToProps = (dispatch) => {
         gotoSection: (thisSection) => {
             dispatch(setCurrentSection(thisSection));
         },
+        setDocumentsList: (documentList) => {
+            dispatch(setDocumentsList(documentList));
+        },
     };
 };
 
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index 3e7f9968..7325757b 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -27,7 +27,7 @@ let CompleteAppeal = (props) => {
         Object.assign(updateBody, {
             "pinswg_Appellant@odata.bind":
                 "/contacts(" + props.props.accountDetails.loggedinUserId + ")",
-            "pinswg_AssociatedLPA@odata.bind":
+            "pinswg_LocalPlanningAuthority@odata.bind":
                 "/accounts(" + props.appealType.appealLPA + ")",
             "pinswg_name": props.appealType.caseReference.ticketnumber,
             [updateBindAppealTypeToIncident + "@odata.bind"]:
@@ -35,6 +35,7 @@ let CompleteAppeal = (props) => {
         });
 
         updateBody = JSON.stringify(updateBody);
+        console.log("werwe");
 
         updateBody = updateBody.replace(/:"Yes"/gm, `:true`);
         updateBody = updateBody.replace(/:"No"/gm, `:false`);
diff --git a/components/timeout/index.js b/components/timeout/index.js
index 7580312e..093badd4 100644
--- a/components/timeout/index.js
+++ b/components/timeout/index.js
@@ -52,7 +52,7 @@ const TimeOut = (props) => {
                 }}
                 element={document}
                 stopOnIdle={true}
-                onActive={console.log(" bbis active", idleTimer)}
+                //onActive={console.log(" bbis active", idleTimer)}
                 onIdle={onIdle}
                 timeout={1000 * inactiveTimeOut * 1}
             />
diff --git a/data/crmfieldlookuptranslations.json b/data/crmfieldlookuptranslations.json
index 5b7d6393..2047a1b0 100644
--- a/data/crmfieldlookuptranslations.json
+++ b/data/crmfieldlookuptranslations.json
@@ -2123,6 +2123,230 @@
                 {
                     "value": "Type of Planning Application",
                     "value_cy": "Math o Gais Cynllunio"
+                },
+                {
+                    "value": "Case reference",
+                    "value_cy": "Cyfeirnod achos"
+                },
+                {
+                    "value": "Development description",
+                    "value_cy": "Disgrifiad o'r datblygiad"
+                },
+                {
+                    "value": "Do not include personal or financial information.",
+                    "value_cy": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol."
+                },
+                {
+                    "value": "Has the description of the development changed since the application was submitted?",
+                    "value_cy": "Ydy disgrifiad o'r datblygiad wedi newid ers cyflwyno'r cais?"
+                },
+                {
+                    "value": "What date was your application decided on by the LPA?",
+                    "value_cy": "Ar ba ddyddiad y penderfynodd yr ACLl ar eich cais?"
+                },
+                {
+                    "value": "What was the LPA Application Reference number given to your application?",
+                    "value_cy": "Beth oedd y Cyfeirnod Cais ACLl a roddwyd i'ch cais?"
+                },
+                {
+                    "value": "When is the application form dated?",
+                    "value_cy": "Pryd mae dyddiad ar y ffurflen gais?"
+                },
+                {
+                    "value": "Has your application been decided by the LPA?",
+                    "value_cy": "A yw'r ACLl wedi penderfynu ar eich cais?"
+                },
+                {
+                    "value": "Appeal details",
+                    "value_cy": "Manylion yr apêl"
+                },
+                {
+                    "value": "Site visit information",
+                    "value_cy": "Gwybodaeth ymweliad safle"
+                },
+                {
+                    "value": "Appeal site ownership details",
+                    "value_cy": "Manylion perchnogaeth safle apêl"
+                },
+                {
+                    "value": "Ownership Certificate",
+                    "value_cy": "Tystysgrif Perchnogaeth"
+                },
+                {
+                    "value": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.",
+                    "value_cy": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon."
+                },
+                {
+                    "value": "Not applicable",
+                    "value_cy": "Amherthnasol"
+                },
+                {
+                    "value": "Certificate A - (If you are the sole owner of the whole appeal site, certificate A applies). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
+                    "value_cy": "Tystysgrif A - (Os mai chi yw unig berchennog safle cyfan yr apźl, mae tystysgrif A yn gymwys). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb ac eithrio’r apelydd, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef"
+                },
+                {
+                    "value": "Certificate B - I certify that the appellant (or the agent) has given the requisite notice (see the guidance leaflet) to everyone else who, on the day 21 days before the date of this appeal, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates, as listed below:",
+                    "value_cy": "Tystysgrif B – Tystiaf fod y mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol (gweler y daflen arweiniad) i bawb arall a oedd, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o y tir y mae'r apźl yn ymwneud ag ef, fel y'i rhestrir isod:"
+                },
+                {
+                    "value": "Certificates C & D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annexe 1 of our guidance and attach it to the appeal form",
+                    "value_cy": "Tystysgrifau C a D - Os nad ydych yn gwybod pwy sy'n berchen ar safle'r apźl i gyd neu ran ohono, cwblhewch naill ai Tystysgrif C neu Dystysgrif D yn Atodiad 1 ein canllaw a'i hatodi i'r ffurflen apelio"
+                },
+                {
+                    "value": "Agricultural holding",
+                    "value_cy": "Daliadaeth amaethyddol"
+                },
+                {
+                    "value": "We also need to know whether the appeal site forms part of an agricultural holding. Please select either (a), (b)(i) or (b)(ii)",
+                    "value_cy": "Mae angen inni wybod hefyd a yw safle'r apźl yn rhan o ddaliad amaethyddol. Dewiswch naill ai (a), (b)(i) neu (b)(ii)"
+                },
+                {
+                    "value": "(a) None of the land to which the appeal relates is, or is part of, an agricultural holding",
+                    "value_cy": "(a) Nid oes unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef yn ddaliad amaethyddol, neu’n rhan o ddaliad amaethyddol"
+                },
+                {
+                    "value": "(b) (i) The appeal site is, or is part of an agricultural holding, and the appellant is the sole agricultural tenant",
+                    "value_cy": "(b) (i) Mae safle’r apêl yn ddaliad amaethyddol, neu’n rhan o ddaliad amaethyddol, a’r apelydd yw’r unig denant amaethyddol"
+                },
+                {
+                    "value": "(b) (ii) The appeal site is, or is part of, an agricultural holding and the appellant (or the agent) has given the requisite notice to every person (other than the appellant) who, on the day 21 days before the date of the appeal, was a tenant of anagricultural holding on all or part of the land to which the appeal relates as listed below:",
+                    "value_cy": "(b) (ii) Mae safle’r apêl yn ddaliad amaethyddol neu’n rhan o ddaliad amaethyddol ac mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol i bob person (ac eithrio’r apelydd) sydd, ar y diwrnod 21 diwrnod cyn y dyddiad o’r apêl, a oedd yn denant daliad amaethyddol ar y cyfan neu ran o’r tir y mae’r apêl yn ymwneud ag ef fel a restrir isod:"
+                },
+                {
+                    "value": "Tenants name",
+                    "value_cy": "Enw'r tenant"
+                },
+                {
+                    "value": "Date started",
+                    "value_cy": "Dyddiad dechrau"
+                },
+                {
+                    "value": "Site Viewable from Road",
+                    "value_cy": "Safle Gweladwy o Ffordd"
+                },
+                {
+                    "value": "Does the inspector need to enter the site?",
+                    "value_cy": "A oes angen i'r arolygydd fynd i mewn i'r safle?"
+                },
+                {
+                    "value": "Please explain why the inspector needs to enter the site",
+                    "value_cy": "Eglurwch pam fod angen i'r arolygydd fynd i mewn i'r safle"
+                },
+                {
+                    "value": "Do not include personal or financial information.",
+                    "value_cy": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol."
+                },
+                {
+                    "value": "Are there any health and safety issues the Inspector needs to be aware of when visiting the site?",
+                    "value_cy": "A oes unrhyw faterion iechyd a diogelwch y mae angen i'r Arolygydd fod yn ymwybodol ohonynt wrth ymweld â'r safle?"
+                },
+                {
+                    "value": "Please set out the potential health and safety issues",
+                    "value_cy": "Nodwch y materion iechyd a diogelwch posibl"
+                },
+                {
+                    "value": "Do not include personal or financial information.",
+                    "value_cy": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol."
+                },
+                {
+                    "value": "Appeal site information",
+                    "value_cy": "Gwybodaeth safle apêl"
+                },
+                {
+                    "value": "What is overall the size of the appeal site, as shown on the red line boundary plan? (in hectares)",
+                    "value_cy": "Beth yw maint safle'r apęl yn gyffredinol, fel y dangosir ar gynllun ffin y llinell goch? (mewn hectarau)"
+                },
+                {
+                    "value": "What is the area of floor space proposed? (in square metres). If no new floor space is proposed, please enter 0.",
+                    "value_cy": "Beth yw arwynebedd y llawr a gynigir? (mewn metrau sgwâr). Os na chynigir arwynebedd llawr newydd, nodwch 0."
+                },
+                {
+                    "value": "Is flooding an issue?",
+                    "value_cy": "Ydy llifogydd yn broblem?"
+                },
+                {
+                    "value": "Do the works affect the setting of a Listed Building?",
+                    "value_cy": "A yw'r gwaith yn effeithio ar leoliad Adeilad Rhestredig?"
+                },
+                {
+                    "value": "Is the appeal site within an Area of Outstanding Natural Beauty?",
+                    "value_cy": "A yw safle'r apźl o fewn Ardal o Harddwch Naturiol Eithriadol?"
+                },
+                {
+                    "value": "Is the appeal site in a Conservation Area?",
+                    "value_cy": "A yw safle'r apźl mewn Ardal Gadwraeth?"
+                },
+                {
+                    "value": "Is the appeal site in or adjacent to, or likely to affect a Site of Special Scientific Interest (SSSI), a Special Conservation Area (SAC) or an Internationally Designated Site?",
+                    "value_cy": "A yw safle'r apźl o fewn neu'n gyfagos i Safle o Ddiddordeb Gwyddonol Arbennig (SoDdGA), Ardal Cadwraeth Arbennig (ACA) neu Safle a Ddynodir yn Rhyngwladol, neu'n debygol o effeithio arno?"
+                },
+                {
+                    "value": "Are any protected species likely to be affected by the proposals?",
+                    "value_cy": "A yw unrhyw rywogaethau a warchodir yn debygol o gael eu heffeithio gan y cynigion?"
+                },
+                {
+                    "value": "Appeal procedure",
+                    "value_cy": "Trefn apelio"
+                },
+                {
+                    "value": "Upload documents",
+                    "value_cy": "Uwchlwytho dogfennau"
+                },
+                {
+                    "value": "Are you appealing because of",
+                    "value_cy": "Ydych chi'n apelio oherwydd"
+                },
+                {
+                    "value": "Has there been any other appeals made on this, or on nearby land, against a refusal of planning permission?",
+                    "value_cy": "A oes unrhyw apeliadau eraill wedi eu gwneud ar hyn, neu ar dir cyfagos, yn erbyn gwrthod caniatâd cynllunio?"
+                },
+                {
+                    "value": "Please provide details of the appeals including our reference number, if known",
+                    "value_cy": "Rhowch fanylion yr apeliadau gan gynnwys ein rhif cyfeirnod, os yw'n hysbys"
+                },
+                {
+                    "value": "Do not include personal or financial information.",
+                    "value_cy": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol."
+                },
+                {
+                    "value": "Submission of case",
+                    "value_cy": "Cyflwyno achos"
+                },
+                {
+                    "value": "Introduction",
+                    "value_cy": "Rhagymadrodd"
+                },
+                {
+                    "value": "What procedure would you like the appeal to follow? More informatiion on this can be found in the guidance notes.",
+                    "value_cy": "Pa weithdrefn yr hoffech i'r apêl ei dilyn? Ceir rhagor o wybodaeth am hyn yn y nodiadau canllaw."
+                },
+                {
+                    "value": "Please explain why you have chosen this procedure",
+                    "value_cy": "Eglurwch pam eich bod wedi dewis y driniaeth hon"
+                },
+                {
+                    "value": "Do not include personal or financial information.",
+                    "value_cy": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol."
+                },
+                {
+                    "value": "Do you intend to submit a costs application with this appeal? (see guidance for further information)",
+                    "value_cy": "A ydych yn bwriadu cyflwyno cais costau gyda'r apêl hon? (gweler y canllawiau am ragor o wybodaeth)"
+                },
+                {
+                    "value": "Would you prefer a virtual or in person event?",
+                    "value_cy": "A fyddai'n well gennych ddigwyddiad rhithwir neu ddigwyddiad personol?"
+                },
+                {
+                    "value": "Virtual",
+                    "value_cy": "Rhith"
+                },
+                {
+                    "value": "In person",
+                    "value_cy": "Yn bersonol"
+                },
+                {
+                    "value": "Please explain why you have chosen this procedure",
+                    "value_cy": "Eglurwch pam eich bod wedi dewis y driniaeth hon"
                 }
             ]
         }
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
index 048d3014..d9e85501 100644
--- a/data/formsxml/planningappeals78.xml
+++ b/data/formsxml/planningappeals78.xml
@@ -2,20 +2,20 @@
 	<tabs>
 		<tab verticallayout="true" id="{a2ae876c-1d95-47bd-928e-9e80dac7bccb}" IsUserDefined="1">
 			<labels>
-				<label description="General" languagecode="1033" />
+				<label description="Introduction" languagecode="1033" />
 			</labels>
 			<columns>
 				<column width="100%">
 					<sections>
 						<section showlabel="false" showbar="false" IsUserDefined="0" id="{a3f7d469-da85-4007-a3b5-c6377d183c66}">
 							<labels>
-								<label description="General" languagecode="1033" />
+								<label description="Introduction" languagecode="1033" />
 							</labels>
 							<rows>
 								<row>
 									<cell id="{f89495f9-e583-4806-9f63-eb85e61786f9}">
 										<labels>
-											<label description="Name" languagecode="1033" />
+											<label description="Case reference" hint="newappeal:new-appeal-introduction-paragraph" languagecode="1033" />
 										</labels>
 										<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
 									</cell>
@@ -26,26 +26,6 @@
 											<label description="Case" languagecode="1033" />
 										</labels>
 										<control id="pinswg_planningappeals78ids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_planningappeals78ids" disabled="false" uniqueid="{e66b1aa3-59b9-7508-818e-c5289da259d3}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													false
-												</DisableViewPicker>
-												<DefaultViewId>
-													{9AC51863-58C7-49A0-ADCC-AFD9A4C3EE59}
-												</DefaultViewId>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
 										</control>
 									</cell>
 								</row>
@@ -55,29 +35,6 @@
 											<label description="Associated (LPA)" languagecode="1033" />
 										</labels>
 										<control id="pinswg_localplanningauthority" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_localplanningauthority" disabled="false" uniqueid="{70a200cc-bb9e-6844-4a34-1a602a160655}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													true
-												</DisableViewPicker>
-												<DefaultViewId>
-													{0ABD7146-7DE5-EB11-AAC5-00224800BE9C}
-												</DefaultViewId>
-												<AvailableViewIds>
-													{A9AF0AB8-861D-4CFA-92A5-C6281FED7FAB},{0ABD7146-7DE5-EB11-AAC5-00224800BE9C}
-												</AvailableViewIds>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
 										</control>
 									</cell>
 								</row>
@@ -87,26 +44,6 @@
 											<label description="Appellant" languagecode="1033" />
 										</labels>
 										<control id="pinswg_appellant" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_appellant" disabled="false" uniqueid="{741912d8-01ae-e9d6-1d7c-cc2aedc47696}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													true
-												</DisableViewPicker>
-												<DefaultViewId>
-													{EF816E54-E5D5-EB11-AAC5-00224800BE9C}
-												</DefaultViewId>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
 										</control>
 									</cell>
 								</row>
@@ -116,465 +53,9 @@
 				</column>
 			</columns>
 		</tab>
-		<!--
-		<tab name="Case" id="{916ab6b9-b90c-073a-41d4-a7a8ed021882}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
-		<labels>
-		<label description="Case" languagecode="1033" />
-		</labels>
-		<columns>
-		<column width="50%">
-		<sections>
-		<section name="tab_2_section_1" showlabel="false" showbar="false" locklevel="0" id="{44204822-1432-dae4-c12e-c45971ec93e4}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{6c14e97d-1832-c091-7247-c6154c61a868}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Appointed By" languagecode="1033" />
-		</labels>
-		<control id="pinswg_appointedby" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_appointedby" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{d008a486-3abb-b267-c76e-8710ca3aee73}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Band" languagecode="1033" />
-		</labels>
-		<control id="pinswg_band" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_band" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{7cd1b33b-5403-ebaa-0011-0168baab7ad3}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Case Type" languagecode="1033" />
-		</labels>
-		<control id="pinswg_casetype" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_casetype" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{9a2a1dd3-ee8b-81d0-e5e0-62261e42e07a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Casework Reason" languagecode="1033" />
-		</labels>
-		<control id="pinswg_caseworkreason" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_caseworkreason" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{9d6c3633-98c9-4827-5eb1-90ce085c5045}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Cost Applied for" languagecode="1033" />
-		</labels>
-		<control id="pinswg_costappliedforindicator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindicator" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{d245b4e9-c4b8-4160-38b2-c041dabea320}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Case Recovered" languagecode="1033" />
-		</labels>
-		<control id="pinswg_caserecovered" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_caserecovered" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{145cd32e-8196-8d11-d6a2-829c6807bd69}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Decision" languagecode="1033" />
-		</labels>
-		<control id="pinswg_dicision" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_dicision" disabled="false" uniqueid="{a80e3bb1-429d-a5ee-9eb6-01308d491d5e}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{9c932861-dda2-693c-860b-598d1373aad4}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Decision Branch" languagecode="1033" />
-		</labels>
-		<control id="pinswg_decisionbranch" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_decisionbranch" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{81d30da1-7ebd-a402-da07-b0b4d884b240}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Development Type" languagecode="1033" />
-		</labels>
-		<control id="pinswg_developmenttype" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_developmenttype" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{bb669232-5dd3-1625-c932-4021bb8aa4c5}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Development/Allegation Description" languagecode="1033" />
-		</labels>
-		<control id="pinswg_developmentallegationdescription" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_developmentallegationdescription" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{38649290-ab59-7b57-eab8-e4263244a127}" showlabel="true" locklevel="0" rowspan="3">
-		<labels>
-		<label description="Important Information" languagecode="1033" />
-		</labels>
-		<control id="pinswg_importantinformation" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_importantinformation" disabled="false" uniqueid="{27c10450-a692-55e2-6d26-bc4a6e90ea80}" />
-		</cell>
-		</row>
-		<row>
-		</row>
-		<row />
-		<row>
-		<cell id="{6584d830-0608-7123-4684-49a91401a4b9}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Jurisdiction" languagecode="1033" />
-		</labels>
-		<control id="pinswg_jurisdiction" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_jurisdiction" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{dc6acc87-bcac-e8d8-b8bb-4c8abc1b9ac0}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Level" languagecode="1033" />
-		</labels>
-		<control id="pinswg_level" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_level" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		<column width="50%">
-		<sections>
-		<section name="tab_2_section_2" showlabel="false" showbar="false" locklevel="0" id="{61e04082-4629-74c5-0801-5c940c2ec114}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{644d9c77-8d14-0786-a723-02260e878830}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Portal URL" languagecode="1033" />
-		</labels>
-		<control id="pinswg_portalurl" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_portalurl" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{5a26018b-1231-e309-ee62-cbe57ea5a9c1}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Procedure" languagecode="1033" />
-		</labels>
-		<control id="pinswg_procedure" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_procedure" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{c1b7493a-71da-0e2b-3a2b-980cd12aa52a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Processing State" languagecode="1033" />
-		</labels>
-		<control id="pinswg_processingstate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_processingstate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{3cdb5612-3658-d89a-04cc-542d445db1b9}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Redetermined Indicator" languagecode="1033" />
-		</labels>
-		<control id="pinswg_predeterminedindicator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_predeterminedindicator" disabled="false" uniqueid="{0854b837-79b2-292a-1793-1065c11202c7}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{37d81009-a880-e28e-be3e-8aae8d8766cd}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Source Indicator" languagecode="1033" />
-		</labels>
-		<control id="pinswg_sourceindicator" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_sourceindicator" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{4305b070-dc75-532b-555d-3461656a6440}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Specialism" languagecode="1033" />
-		</labels>
-		<control id="pinswg_specialism" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_specialism" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{8c9bb7c6-4c03-3981-82eb-c80d036069c7}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Validity" languagecode="1033" />
-		</labels>
-		<control id="pinswg_validity" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_validity" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{3dc94325-ae60-959c-9b1e-a5cee2bd664d}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Conditional Appeal" languagecode="1033" />
-		</labels>
-		<control id="pinswg_conditionalappeal" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_conditionalappeal" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{4166db32-9737-b25e-0e75-6659a53342ba}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Listed Building and Conservation Area Appeal" languagecode="1033" />
-		</labels>
-		<control id="pinswg_listedbuildingandconservationareaappeal" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildingandconservationareaappeal" disabled="false" uniqueid="{8436e11a-66a7-36e9-c5bb-13b3e9cb773b}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{39a41e48-1939-1cc9-bed9-375721874973}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Conditions/LDC - Application Made under section" languagecode="1033" />
-		</labels>
-		<control id="pinswg_conditionsldcapplicationmadeunder" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_conditionsldcapplicationmadeunder" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{80196e8a-a183-cbea-1275-7306444997bd}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Detailed EIA Screening required?" languagecode="1033" />
-		</labels>
-		<control id="pinswg_detailedeiascreeningrequired" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_detailedeiascreeningrequired" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{87b3d8ed-6812-eaee-d9cd-c8cd91c0a67b}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Prior Notification/Prior Approval" languagecode="1033" />
-		</labels>
-		<control id="pinswg_priornotificationpriorapproval" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_priornotificationpriorapproval" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		</columns>
-		</tab>
-		-->
-		<!--
-		<tab name="Case Dates" id="{38d2ba0e-cb73-a301-51b8-6b6aad4147c1}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
-		<labels>
-		<label description="Case Dates" languagecode="1033" />
-		</labels>
-		<columns>
-		<column width="50%">
-		<sections>
-		<section name="tab_3_section_1" showlabel="false" showbar="false" locklevel="0" id="{b1db58eb-4e41-7c3e-3bbb-5c97c0ea8d57}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{2224106d-9b9e-9b29-1a98-7dae2a06a1c1}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Original Case Decision Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_originalcasedecisiondate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_originalcasedecisiondate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{7414ce6b-2408-d079-9c25-a319697ad2a4}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Receipt Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_receiptdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_receiptdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{3406391c-e670-2d78-c8b4-10b1743adb31}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Withdrawal Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_withdrawaldate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_withdrawaldate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{61751077-19b0-947c-e607-8503e1dd0d8a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Bespoke Target Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_bespoketargetdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_bespoketargetdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{61268797-4085-b502-6b8b-0eaa79580c02}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Call In Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_callindate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_callindate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{861ea4ac-3618-bdee-62b6-69009044cc78}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Case Decision Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_casedecisiondate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_casedecisiondate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{0daace68-2c66-e430-4caa-9ad70ca20d7b}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Not Recovered" languagecode="1033" />
-		</labels>
-		<control id="pinswg_datenotrecovered" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_datenotrecovered" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{16da78b0-9961-1371-6a93-6d7bb59a0566}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Recovered" languagecode="1033" />
-		</labels>
-		<control id="pinswg_daterecovered" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_daterecovered" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{9d8b8dac-1dbd-a869-117d-245525602915}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Sent to Decision Branch" languagecode="1033" />
-		</labels>
-		<control id="pinswg_datesenttodecisionbranch" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_datesenttodecisionbranch" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		<column width="50%">
-		<sections>
-		<section name="tab_3_section_2" showlabel="false" showbar="false" locklevel="0" id="{8a264131-321d-5b57-d091-c9933214a440}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{0d429b56-2cd5-ce3a-9d0a-cddb2137ee00}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Validation Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_validationdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_validationdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{00471056-1286-92b5-8780-ac0a42267874}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Start Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_startdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_startdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{e5c135e6-18d6-bdce-7262-19dc3a389675}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Target Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_targetdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_targetdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{d8e6ede7-3691-4a1a-ee19-5bc5bab4b95e}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Interim Decision Confirmed" languagecode="1033" />
-		</labels>
-		<control id="pinswg_dateinterimdecisionconfirmed" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateinterimdecisionconfirmed" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{4dc00408-4d37-1236-d825-243442b8ec7b}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Application Fee Paid" languagecode="1033" />
-		</labels>
-		<control id="pinswg_applicationfeepaid" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_applicationfeepaid" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{ec3ad68c-710e-7dbb-48c4-c3381649028d}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Determination Fee Paid" languagecode="1033" />
-		</labels>
-		<control id="pinswg_determinationfeepaid" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_determinationfeepaid" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		</columns>
-		</tab>
-		-->
-		<!--
-		<tab name="Case Document Dates" id="{600599e1-94c1-1286-68ee-d442a57077ac}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
-		<labels>
-		<label description="Case Document Dates" languagecode="1033" />
-		</labels>
-		<columns>
-		<column width="50%">
-		<sections>
-		<section name="tab_4_section_1" showlabel="false" showbar="false" locklevel="0" id="{e9110824-beb9-ac4b-a09b-82d08ae26de3}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{7b93a422-db60-67a7-8c78-5599bb908896}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Final Comments Due Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_finalcommentsduedate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_finalcommentsduedate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{15b5d12c-890d-751d-5d60-9c4644de94be}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Proofs of Evidence/Written Statements of Evidence" languagecode="1033" />
-		</labels>
-		<control id="pinswg_proofsofevidencewrittenstatementsofeviden" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_proofsofevidencewrittenstatementsofeviden" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{4d6c80bc-686d-53e7-a465-10a0a0de8a5a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Questionnaire Due Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_questionnaireduedate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_questionnaireduedate" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		<column width="50%">
-		<sections>
-		<section name="tab_4_section_2" showlabel="false" showbar="false" locklevel="0" id="{a4047d5d-b307-6d08-c93c-18223e36be72}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{195907b4-e154-c3c1-138a-c2ca18e48965}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Other Parties Statement" languagecode="1033" />
-		</labels>
-		<control id="pinswg_otherpartiesstatement" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_otherpartiesstatement" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{c4c1b05c-b4de-c91e-689b-e73a4c63665a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Main Party Statement Due Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_statementduedate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_statementduedate" disabled="false" uniqueid="{95476096-0405-1702-6922-6676b622e8d1}" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		</columns>
-		</tab>
-		-->
 		<tab name="Case Site" id="{3c9aa400-961a-d69c-8375-cc4c6a1b233a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
 			<labels>
-				<label description="Case Site" languagecode="1033" />
+				<label description="Appeal details" languagecode="1033" />
 			</labels>
 			<columns>
 				<column width="50%">
@@ -585,19 +66,51 @@
 							</labels>
 							<rows>
 								<row>
-									<cell id="{82689d9b-362c-ec69-cd26-c8b4bda7d132}" showlabel="true" locklevel="0">
+									<cell id="{d7123ae6-6c1d-0b63-17c9-2de36184b215}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
+											<label description="Development description" languagecode="1033" />
 										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{7b8ccad3-4c70-8d3d-7263-8b6c5751d089}" />
+										<control validation="[required]" id="pinswg_developmentdescription" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_developmentdescription" disabled="false" uniqueid="{b2198a1b-2890-01a4-e2ae-0082bdde6550}" />
 									</cell>
 								</row>
 								<row>
-									<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
+											<label description="Has the description of the development changed since the application was submitted?" languagecode="1033" />
 										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{060e23c0-9e75-771c-3ad3-d04aeaccbd4a}" />
+										<control validation="[required]" id="pinswg_developmentdescriptionchanged" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentdescriptionchanged" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" requiredDocumentValue="Yes" requiredDocumentLabel="LPA confirmation of change" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{78285a67-9567-7e9c-aa04-7e81039720cb}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What was the LPA Application Reference number given to your application?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_lpaapplicationreference" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_lpaapplicationreference" disabled="false" uniqueid="{893beceb-8a25-a4e8-4114-a45b27e32021}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b5c726bc-5422-ee5b-783b-d196568d0d25}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="When is the application form dated?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_dateofapplication" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateofapplication" dateStart="-5y" dateEnd="0" disabled="false" uniqueid="{5c5c2d58-50c5-a786-8bc4-78a5a6e84db8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1445de13-7ae5-02e8-cbdd-ca63a0ab1230}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Has your application been decided by the LPA?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_lpadecisiononapplicationmade" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_lpadecisiononapplicationmade" disabled="false" uniqueid="{378a3325-e351-114a-00b2-b5d1cdd67e2a}" requiredDocumentValue="Yes" requiredDocumentLabel="LPA Application decision" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1445de13-7ae5-02e8-cbdd-ca63a0ab1230}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What date was your application decided on by the LPA?" languagecode="1033" />
+										</labels>
+										<control id="pinswg_dateoflpadecision" parentField="pinswg_lpadecisiononapplicationmade" parentFieldShowOnValue="Yes" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateoflpadecision" dateStart="0" dateEnd="+1y" disabled="false" uniqueid="{378a3325-e351-114a-00b2-b5d1cdd67e2a}" />
 									</cell>
 								</row>
 								<row>
@@ -605,7 +118,7 @@
 										<labels>
 											<label description="Site Address Line 1" languagecode="1033" />
 										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{12a91c81-69b9-0226-16ec-3d0620ab6a75}" />
+										<control validation="[required]" id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{12a91c81-69b9-0226-16ec-3d0620ab6a75}" />
 									</cell>
 								</row>
 								<row>
@@ -621,7 +134,7 @@
 										<labels>
 											<label description="Site Address Town" languagecode="1033" />
 										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed422834-2434-d428-a8db-70d51540c844}" />
+										<control validation="[required]" id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed422834-2434-d428-a8db-70d51540c844}" />
 									</cell>
 								</row>
 								<row>
@@ -629,7 +142,7 @@
 										<labels>
 											<label description="Site Address County" languagecode="1033" />
 										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{407764c4-23c3-9ae7-4add-4d495032e4a5}" />
+										<control validation="[required]" id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{407764c4-23c3-9ae7-4add-4d495032e4a5}" />
 									</cell>
 								</row>
 								<row>
@@ -637,31 +150,7 @@
 										<labels>
 											<label description="Site Address Postcode" languagecode="1033" />
 										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{42523297-441d-d55a-cee4-c4d0baa18ad8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5e4de7cc-0ac5-8a43-24d9-473d266016c2}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{e352d69a-1dd2-2c74-7ba9-543585538201}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
+										<control validation="[required]" id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{42523297-441d-d55a-cee4-c4d0baa18ad8}" />
 									</cell>
 								</row>
 							</rows>
@@ -675,270 +164,15 @@
 								<label description="Section" languagecode="1033" />
 							</labels>
 							<rows>
-								<row>
-									<cell id="{c858c582-269d-e1d4-60e7-828b19b5dd78}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Agricultural Holding" languagecode="1033" />
-										</labels>
-										<control id="pinswg_agriculturalholding" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{b3eb3b19-cc13-6106-6e1b-bec81e759eea}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{736042e8-d03e-e30e-520e-c2226136c43c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Area Of Site in Hectares" languagecode="1033" />
-										</labels>
-										<control id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e761a48e-1548-7cc5-a5cd-a7b6ab23a0e3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Development affect setting of a listed building" languagecode="1033" />
-										</labels>
-										<control id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{977a773c-b96c-8e0a-776e-240024ea1839}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Floor Space in Square Meters" languagecode="1033" />
-										</labels>
-										<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b773862a-8e6a-0d73-dc18-ad9c25394be3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="In CA/Relates to CA" languagecode="1033" />
-										</labels>
-										<control id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{15290652-5091-dba8-d86c-d1a486e3b892}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8b1c3c99-3b8a-d009-59c9-580e10951844}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is Flooding and Issue" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c35a5391-6c3a-e992-9495-6ae31ec6ad33}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is the Site within an AONB" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{e38c9a83-c426-a7b4-b8a2-24d2a2a85b87}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{57622047-2bb3-1e78-92bd-251b16723b31}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landuse" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landuse" disabled="false" uniqueid="{5113b3a8-d44b-c37b-865b-a5a089b7ecd0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{76b0a030-bd33-9dac-9163-ab33b466210b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use Category" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landusecategory" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landusecategory" disabled="false" uniqueid="{a1617e60-a245-3547-6948-1562933190c5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{bce2e245-a090-3cbe-a188-c5c2a3b6e061}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Listed Building Grade" languagecode="1033" />
-										</labels>
-										<control id="pinswg_listedbuildinggrade" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildinggrade" disabled="false" uniqueid="{bd7e4e3d-c2cb-9492-71b3-10aa0e41427a}" />
-									</cell>
-								</row>
 							</rows>
 						</section>
 					</sections>
 				</column>
 			</columns>
 		</tab>
-		<!--
-		<tab name="Event" id="{0910a923-dd47-e7a7-a68d-e77a365bb39d}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
-		<labels>
-		<label description="Event" languagecode="1033" />
-		</labels>
-		<columns>
-		<column width="50%">
-		<sections>
-		<section name="tab_7_section_1" showlabel="false" showbar="false" locklevel="0" id="{2ca16e79-7bbb-94eb-6667-a0731452485b}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{eb2da7e9-06ac-7037-2198-7d1ce11b365a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Actual Duration" languagecode="1033" />
-		</labels>
-		<control id="pinswg_actualdurationdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_actualdurationdec" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{19959a6a-8544-bb08-6395-d43a1bde0819}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Caseworker Allocation Notes" languagecode="1033" />
-		</labels>
-		<control id="pinswg_caseworkerallocationnotes" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_caseworkerallocationnotes" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{e0724435-541c-4c4d-b4d9-44ca9169279b}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Event Requested" languagecode="1033" />
-		</labels>
-		<control id="pinswg_dateeventrequested" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateeventrequested" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{c9264047-92d4-326d-8608-d1ae48761c4a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Date Exported to ISS" languagecode="1033" />
-		</labels>
-		<control id="pinswg_dateexportedtoiss" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateexportedtoiss" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{5348c419-5c75-ab68-3a34-9744d575cb5c}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="End Date of the Event" languagecode="1033" />
-		</labels>
-		<control id="pinswg_enddateoftheevent" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_enddateoftheevent" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{d9b806de-b978-7443-1174-998d840ba51c}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Est Prep Time" languagecode="1033" />
-		</labels>
-		<control id="pinswg_estpreptime" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_estpreptime" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{db2ba09d-7769-a9da-5293-e3e68b214929}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Est Rep Time" languagecode="1033" />
-		</labels>
-		<control id="pinswg_estreptime" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_estreptime" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{7e105cd8-aaec-3aca-3013-449241ae457a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Est Sit Time" languagecode="1033" />
-		</labels>
-		<control id="pinswg_estsittime" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_estsittime" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		<column width="50%">
-		<sections>
-		<section name="tab_7_section_2" showlabel="false" showbar="false" locklevel="0" id="{08969964-26c1-5a6e-a4e7-2316ad47d4ee}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{8b898db9-8a31-b86c-2be8-8e6c8664519a}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Address County" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_eventaddresscounty" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{755b6a0a-b326-4713-0549-e779d9e6080d}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Address Line 1" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_eventaddressline1" disabled="false" uniqueid="{be773e97-6b10-51d5-6e9b-ad3d91007802}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{e880a7d3-9835-8ca0-1190-45a9ce139e6e}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Address Line 2" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_eventaddressline2" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{429c459c-9ae0-9aed-098c-b0ec169d7201}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Address Postcode" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_eventaddresspostcode" disabled="false" uniqueid="{14bb43b9-3db1-4cb3-56d9-a3c5caca905b}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{1ac1c795-6d13-52d9-1083-581bb6e9e8e3}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Name" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventname" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_eventname" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{636c9612-4491-9266-b514-cb32cd067b3e}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Event Publish Flag" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eventpublishflag" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_eventpublishflag" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{85c8d610-795b-4e89-21c2-1a9704e8d232}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Notification of SV" languagecode="1033" />
-		</labels>
-		<control id="pinswg_notificationofsv" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_notificationofsv" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{0d0166c5-40b3-6548-c801-09da1cad4c32}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Start Date Time of the Event" languagecode="1033" />
-		</labels>
-		<control id="pinswg_startdatetimeiftheevent" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_startdatetimeiftheevent" disabled="false" uniqueid="{4c4e033c-a184-9e5b-d367-c43cc240038e}" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{ea407dc5-51a4-c4e1-22da-1b07482dcc54}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Type of Event" languagecode="1033" />
-		</labels>
-		<control id="pinswg_typeofevent" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_typeofevent" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{99c6e312-2b4e-0078-ad3d-b25c211b01e1}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Urgent Indicator" languagecode="1033" />
-		</labels>
-		<control id="pinswg_urgentindecator" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_urgentindecator" disabled="false" uniqueid="{5323e436-102b-9a05-8d3d-940a47120440}" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		</columns>
-		</tab>
-		-->
-		<tab name="Planning Application" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
+		<tab name="Appeal site ownership details" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
 			<labels>
-				<label description="Planning Application" languagecode="1033" />
+				<label description="Appeal site ownership details" languagecode="1033" />
 			</labels>
 			<columns>
 				<column width="50%">
@@ -949,27 +183,35 @@
 							</labels>
 							<rows>
 								<row>
-									<cell id="{b5c726bc-5422-ee5b-783b-d196568d0d25}" showlabel="true" locklevel="0">
+									<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Date of Application" languagecode="1033" />
+											<label description="Ownership Certificate" hint="newappeal:new-appeal-ownership-hint" languagecode="1033" />
 										</labels>
-										<control id="pinswg_dateofapplication" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateofapplication" disabled="false" uniqueid="{5c5c2d58-50c5-a786-8bc4-78a5a6e84db8}" />
+										<control validation="[required]" id="pinswg_ownershipcertificate" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040000|newappeal:new-appeal-ownership-option-NA,846040001|newappeal:new-appeal-ownership-option-A,846040002|newappeal:new-appeal-ownership-option-B,846040003|newappeal:new-appeal-ownership-option-CD]" datafieldname="pinswg_ownershipcertificate" requiredDocumentValue="Yes" requiredDocumentLabel="Relevant Ownership certificate" disabled="false" uniqueid="{060e23c0-9e75-771c-3ad3-d04aeaccbd4a}" />
 									</cell>
 								</row>
 								<row>
-									<cell id="{1445de13-7ae5-02e8-cbdd-ca63a0ab1230}" showlabel="true" locklevel="0">
+									<cell id="{c858c582-269d-e1d4-60e7-828b19b5dd78}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Date of LPA Decision" languagecode="1033" />
+											<label description="Agricultural holding" hint="newappeal:new-appeal-agricultural-hint" languagecode="1033" />
 										</labels>
-										<control id="pinswg_dateoflpadecision" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateoflpadecision" disabled="false" uniqueid="{378a3325-e351-114a-00b2-b5d1cdd67e2a}" />
+										<control validation="[required]" id="pinswg_agriculturalholding" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040000|newappeal:new-appeal-agricultural-holding-option-yes,846040001|newappeal:new-appeal-agricultural-holding-option-no,846040002|newappeal:new-appeal-agricultural-holding-option-NA]" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{060e23c0-9e75-771c-3ad3-d04aeaccbd4a}" />
 									</cell>
 								</row>
 								<row>
-									<cell id="{d7123ae6-6c1d-0b63-17c9-2de36184b215}" showlabel="true" locklevel="0">
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Development Description" languagecode="1033" />
+											<label description="Tenants name" languagecode="1033" />
 										</labels>
-										<control id="pinswg_developmentdescription" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_developmentdescription" disabled="false" uniqueid="{b2198a1b-2890-01a4-e2ae-0082bdde6550}" />
+										<control id="pinswg_agriculturaltenantname" parentField="pinswg_agriculturalholding" parentFieldShowOnValue="846040002" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_agriculturaltenantname" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{983d6800-93a4-e859-5066-10d445aab8c9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Date started" languagecode="1033" />
+										</labels>
+										<control id="pinswg_agriculturaltenantdateserved" parentField="pinswg_agriculturalholding" parentFieldShowOnValue="846040002" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_agriculturaltenantdateserved" disabled="false" />
 									</cell>
 								</row>
 							</rows>
@@ -983,141 +225,288 @@
 								<label description="Section" languagecode="1033" />
 							</labels>
 							<rows>
-								<row>
-									<cell id="{78285a67-9567-7e9c-aa04-7e81039720cb}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="LPA Application Reference" languagecode="1033" />
-										</labels>
-										<control id="pinswg_lpaapplicationreference" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_lpaapplicationreference" disabled="false" uniqueid="{893beceb-8a25-a4e8-4114-a45b27e32021}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{03db1191-0463-b5b1-1b39-12676308e3e3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Retrospective Applications" languagecode="1033" />
-										</labels>
-										<control id="pinswg_retrospectiveapplications" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_retrospectiveapplications" disabled="false" uniqueid="{5250ebc0-5514-0b73-8da9-47ea8e6b89a4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{cbb2a452-262b-5c8e-4183-1ad7d762547e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Type of Planning Application" languagecode="1033" />
-										</labels>
-										<control id="pinswg_typeofplanningapplication" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_typeofplanningapplication" disabled="false" uniqueid="{037a981b-a839-3d91-b3b0-612a1e95127a}" />
-									</cell>
-								</row>
 							</rows>
 						</section>
 					</sections>
 				</column>
 			</columns>
 		</tab>
-		<!--
-		<tab name="EIA Screening" id="{5e9b7dc7-b5ae-4e64-618d-4670321452e8}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
-		<labels>
-		<label description="EIA Screening" languagecode="1033" />
-		</labels>
-		<columns>
-		<column width="50%">
-		<sections>
-		<section name="tab_9_section_1" showlabel="false" showbar="false" locklevel="0" id="{602decdd-be8c-8203-2eb7-881909291ab4}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{983d6800-93a4-e859-5066-10d445aab8c9}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Screening Start Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_screeningstartdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_screeningstartdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{c27a25e6-413a-ac40-4605-e89ec0c23033}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Consultation Start" languagecode="1033" />
-		</labels>
-		<control id="pinswg_consultationstart" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_consultationstart" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{248b5123-59c9-5ab2-4db5-66272980b803}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Consultation End" languagecode="1033" />
-		</labels>
-		<control id="pinswg_consultationend" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_consultationend" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{c625143a-1710-702a-9495-a40a9041ceba}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="EIA Target Date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eiatargetdate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_eiatargetdate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{5c486087-ba15-c5b9-3911-da9dc21a8dcc}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Target Extension" languagecode="1033" />
-		</labels>
-		<control id="pinswg_targetextension" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_targetextension" disabled="false" />
-		</cell>
-		</row>
-		</rows>
-		</section>
-		</sections>
-		</column>
-		<column width="50%">
-		<sections>
-		<section name="tab_9_section_2" showlabel="false" showbar="false" locklevel="0" id="{634a5d08-183d-6650-497d-45498b973927}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-		<labels>
-		<label description="Section" languagecode="1033" />
-		</labels>
-		<rows>
-		<row>
-		<cell id="{c29480b5-8ca8-39ea-72e6-74724149e524}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Extension Reason" languagecode="1033" />
-		</labels>
-		<control id="pinswg_extensionreason" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_extensionreason" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{e297e58c-c5ca-2de0-c2e4-cb9c2be6a447}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="Direction Issued date" languagecode="1033" />
-		</labels>
-		<control id="pinswg_directionissueddate" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_directionissueddate" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{05061193-2cbb-16db-6351-58992a909788}" showlabel="true" locklevel="0">
-		<labels>
-		<label description="EIA Required" languagecode="1033" />
-		</labels>
-		<control id="pinswg_eiarequired" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_eiarequired" disabled="false" />
-		</cell>
-		</row>
-		<row>
-		<cell id="{4cae15c8-5d21-47b3-be5d-71c276318328}" showlabel="true" locklevel="0" rowspan="3">
-		<labels>
-		<label description="Important EIA Information" languagecode="1033" />
-		</labels>
-		<control id="pinswg_importanteiainformation" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_importanteiainformation" disabled="false" uniqueid="{e9a34737-e145-be05-a0be-2050d18d752a}" />
-		</cell>
-		</row>
-		<row />
-		<row />
-		</rows>
-		</section>
-		</sections>
-		</column>
-		</columns>
+		<tab name="Site visit information" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
+			<labels>
+				<label description="Site visit information" languagecode="1033" />
+			</labels>
+			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_1" showlabel="false" showbar="false" locklevel="0" id="{4e1eb631-e11b-5691-9898-d2b6ede6571a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Does the inspector need to enter the site?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_inspectorneededonsite" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_inspectorneededonsite" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Please explain why the inspector needs to enter the site" languagecode="1033" />
+										</labels>
+										<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="Yes" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Are there any health and safety issues the Inspector needs to be aware of when visiting the site?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_healthandsafetyissuesonsite" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_healthandsafetyissuesonsite" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Please set out the potential health and safety issues" languagecode="1033" />
+										</labels>
+										<control id="pinswg_outlinehealthandsafetyissuesonsite" parentField="pinswg_healthandsafetyissuesonsite" parentFieldShowOnValue="Yes" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_outlinehealthandsafetyissuesonsite" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_2" showlabel="false" showbar="false" locklevel="0" id="{db07c5de-b47e-86a5-4104-325d57385b3c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+							</rows>
+						</section>
+					</sections>
+				</column>
+			</columns>
+		</tab>
+		<tab name="Appeal site information" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
+			<labels>
+				<label description="Appeal site information" languagecode="1033" />
+			</labels>
+			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_1" showlabel="false" showbar="false" locklevel="0" id="{4e1eb631-e11b-5691-9898-d2b6ede6571a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{736042e8-d03e-e30e-520e-c2226136c43c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What is overall the size of the appeal site, as shown on the red line boundary plan? (in hectares)" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{977a773c-b96c-8e0a-776e-240024ea1839}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What is the area of floor space proposed? (in square metres). If no new floor space is proposed, please enter 0." languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8b1c3c99-3b8a-d009-59c9-580e10951844}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is flooding an issue?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e761a48e-1548-7cc5-a5cd-a7b6ab23a0e3}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Do the works affect the setting of a Listed Building?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c35a5391-6c3a-e992-9495-6ae31ec6ad33}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is the appeal site within an Area of Outstanding Natural Beauty?" languagecode="1033" />
+										</labels>
+										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{e38c9a83-c426-a7b4-b8a2-24d2a2a85b87}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b773862a-8e6a-0d73-dc18-ad9c25394be3}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is the appeal site in a Conservation Area?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{15290652-5091-dba8-d86c-d1a486e3b892}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is the appeal site in or adjacent to, or likely to affect a Site of Special Scientific Interest (SSSI), a Special Conservation Area (SAC) or an Internationally Designated Site?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Are any protected species likely to be affected by the proposals?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_protectedspecies" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_protectedspecies" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_2" showlabel="false" showbar="false" locklevel="0" id="{db07c5de-b47e-86a5-4104-325d57385b3c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+							</rows>
+						</section>
+					</sections>
+				</column>
+			</columns>
+		</tab>
+		<tab name="Appeal procedure" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
+			<labels>
+				<label description="Appeal procedure" languagecode="1033" />
+			</labels>
+			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_1" showlabel="false" showbar="false" locklevel="0" id="{4e1eb631-e11b-5691-9898-d2b6ede6571a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{9a2a1dd3-ee8b-81d0-e5e0-62261e42e07a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Are you appealing because of" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_caseworkreason" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_caseworkreason" disabled="false" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Has there been any other appeals made on this, or on nearby land, against a refusal of planning permission?" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_additionalappealsmade" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_additionalappealsmade" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Please provide details of the appeals including our reference number, if known" languagecode="1033" />
+										</labels>
+										<control id="pinswg_additionalappealsmadedetails" parentField="pinswg_additionalappealsmade" parentFieldShowOnValue="Yes" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_additionalappealsmadedetails" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_2" showlabel="false" showbar="false" locklevel="0" id="{db07c5de-b47e-86a5-4104-325d57385b3c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+							</rows>
+						</section>
+					</sections>
+				</column>
+			</columns>
+		</tab>
+		<tab name="Submission of case" id="{c7e4c106-c31e-ded8-65a6-0edb7eb8b92a}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
+			<labels>
+				<label description="Submission of case" languagecode="1033" />
+			</labels>
+			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_1" showlabel="false" showbar="false" locklevel="0" id="{4e1eb631-e11b-5691-9898-d2b6ede6571a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{5a26018b-1231-e309-ee62-cbe57ea5a9c1}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What procedure would you like the appeal to follow? More informatiion on this can be found in the guidance notes." languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_procedure" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_procedure" disabled="false" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8b1c3c99-3b8a-d009-59c9-580e10951844}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Would you prefer a virtual or in person event?" languagecode="1033" />
+										</labels>
+										<control id="pinswg_virtualorinpersonevent" parentField="pinswg_procedure" parentFieldShowOnValue="846040001,846040002" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040000|newappeal:new-appeal-procedure-option-virtual,846040001|newappeal:new-appeal-procedure-option-inperson]" datafieldname="pinswg_virtualorinpersonevent" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{977a773c-b96c-8e0a-776e-240024ea1839}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Please explain why you have chosen this procedure" languagecode="1033" />
+										</labels>
+										<control id="pinswg_chosenprocedureexplanation" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_chosenprocedureexplanation" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9d6c3633-98c9-4827-5eb1-90ce085c5045}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Do you intend to submit a costs application with this appeal? (see guidance for further information)" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_costappliedforindicator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindicator" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of costs" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_8_section_2" showlabel="false" showbar="false" locklevel="0" id="{db07c5de-b47e-86a5-4104-325d57385b3c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+							</rows>
+						</section>
+					</sections>
+				</column>
+			</columns>
 		</tab>
-		-->
 		<tab name="Upload documents" id="{56649538-9b29-ce5a-e932-3c3ab8345d16}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
 			<labels>
 				<label description="Upload documents" languagecode="1033" />
@@ -1138,6 +527,14 @@
 										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
+								<row>
+									<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="File upload2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
 							</rows>
 						</section>
 					</sections>
diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json
index 88596748..bcc93912 100644
--- a/locales/cy/newappeal.json
+++ b/locales/cy/newappeal.json
@@ -8,5 +8,34 @@
     "select-appeal-type-label-error-msg": "Mae angen math o achos",
     "select-default": "Dewiswch...",
     "change-link-label": "Newid",
-    "submit-appeal-button": "Cyflwyno apêl"
+    "submit-appeal-button": "Cyflwyno apêl",
+    "about-you-page-title": "Amdanat ti",
+    "about-you-on-behalf-label": "Cyflwynwyd apêl ar ran:",
+    "about-you-who-are-you-label": "Ai chi yw'r apelydd neu asiant sy'n gweithredu ar ran yr apelydd?",
+    "about-you-appellant-contact-details": "Manylion cyswllt yr Apelydd",
+    "about-you-appellant-contact-details-firstname-label": "Enw cyntaf",
+    "about-you-appellant-contact-details-lastname-label": "Enw olaf",
+    "about-you-appellant-contact-details-email-label": "Cyfeiriad ebost",
+    "about-you-appellant-contact-details-phone-label": "Rhif ffôn",
+    "about-you-agent-contact-details": "Manylion cyswllt yr Asiant",
+    "about-you-agent-contact-details-companyname-label": "Enw cwmni",
+    "about-you-agent-contact-details-firstname-label": "Enw cyntaf",
+    "about-you-agent-contact-details-lastname-label": "Enw olaf",
+    "about-you-agent-contact-details-email-label": "Cyfeiriad ebost",
+    "about-you-agent-contact-details-phone-label": "Rhif ffôn",
+    "about-you-agent-contact-preferences-label": "Nodwch a fyddai'n well gennych i ni gysylltu â chi drwy e-bost neu'r post",
+    "new-appeal-progress-nav-label": "Cynnydd",
+    "new-appeal-documentlist-nav": "Angen dogfen",
+    "new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.",
+    "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon.",
+    "new-appeal-ownership-option-NA": "Amherthnasol",
+    "new-appeal-ownership-option-A": "Tystysgrif A - (Os mai chi yw unig berchennog safle cyfan yr apźl, mae tystysgrif A yn gymwys). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb ac eithrio’r apelydd, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef",
+    "new-appeal-ownership-option-B": "Tystysgrif B – Tystiaf fod y mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol (gweler y daflen arweiniad) i bawb arall a oedd, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o y tir y mae'r apźl yn ymwneud ag ef, fel y'i rhestrir isod:",
+    "new-appeal-ownership-option-CD": "Tystysgrifau C a D - Os nad ydych yn gwybod pwy sy'n berchen ar safle'r apźl i gyd neu ran ohono, cwblhewch naill ai Tystysgrif C neu Dystysgrif D yn Atodiad 1 ein canllaw a'i hatodi i'r ffurflen apelio",
+    "new-appeal-agricultural-hint": "Mae angen inni wybod hefyd a yw safle'r apźl yn rhan o ddaliad amaethyddol. Dewiswch naill ai (a), (b)(i) neu (b)(ii)",
+    "new-appeal-agricultural-holding-option-yes": "(a) Nid oes unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef yn ddaliad amaethyddol, neu’n rhan o ddaliad amaethyddol",
+    "new-appeal-agricultural-holding-option-no": "(b) (i) Mae safle’r apêl yn ddaliad amaethyddol, neu’n rhan o ddaliad amaethyddol, a’r apelydd yw’r unig denant amaethyddol",
+    "new-appeal-agricultural-holding-option-NA": "(b) (ii) Mae safle’r apêl yn ddaliad amaethyddol neu’n rhan o ddaliad amaethyddol ac mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol i bob person (ac eithrio’r apelydd) sydd, ar y diwrnod 21 diwrnod cyn y dyddiad o’r apêl, a oedd yn denant daliad amaethyddol ar y cyfan neu ran o’r tir y mae’r apêl yn ymwneud ag ef fel a restrir isod:",
+    "new-appeal-procedure-option-virtual": "Rhith",
+    "new-appeal-procedure-option-inperson": "Yn bersonol"
 }
\ No newline at end of file
diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json
index eaa6bc05..01014afd 100644
--- a/locales/en/newappeal.json
+++ b/locales/en/newappeal.json
@@ -8,5 +8,34 @@
     "select-appeal-type-label-error-msg": "Appeal type is required",
     "select-default": "Select...",
     "change-link-label": "Change",
-    "submit-appeal-button": "Submit appeal"
+    "submit-appeal-button": "Submit appeal",
+    "about-you-page-title": "About you",
+    "about-you-on-behalf-label": "Appeal submitted on behalf of:",
+    "about-you-who-are-you-label": "Are you the appellant or an agent acting on behalf of the appeallant?",
+    "about-you-appellant-contact-details": "Contact details for Appellant",
+    "about-you-appellant-contact-details-firstname-label": "First name",
+    "about-you-appellant-contact-details-lastname-label": "Last name",
+    "about-you-appellant-contact-details-email-label": "Email address",
+    "about-you-appellant-contact-details-phone-label": "Telphone number",
+    "about-you-agent-contact-details": "Contact details for Agent",
+    "about-you-agent-contact-details-companyname-label": "Company name",
+    "about-you-agent-contact-details-firstname-label": "First name",
+    "about-you-agent-contact-details-lastname-label": "Last name",
+    "about-you-agent-contact-details-email-label": "Email address",
+    "about-you-agent-contact-details-phone-label": "Telephone number",
+    "about-you-agent-contact-preferences-label": "Please indicate if you would prefer to be contacted by email or post",
+    "new-appeal-progress-nav-label": "Progress",
+    "new-appeal-documentlist-nav": "Documents needed",
+    "new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.",
+    "new-appeal-ownership-hint": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.",
+    "new-appeal-ownership-option-NA": "Not applicable",
+    "new-appeal-ownership-option-A": "Certificate A - (If you are the sole owner of the whole appeal site, certificate A applies). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
+    "new-appeal-ownership-option-B": "Certificate B - I certify that the appellant (or the agent) has given the requisite notice (see the guidance leaflet) to everyone else who, on the day 21 days before the date of this appeal, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates, as listed below:",
+    "new-appeal-ownership-option-CD": "Certificates C & D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annexe 1 of our guidance and attach it to the appeal form",
+    "new-appeal-agricultural-hint": "We also need to know whether the appeal site forms part of an agricultural holding. Please select either (a), (b)(i) or (b)(ii)",
+    "new-appeal-agricultural-holding-option-yes": "(a) None of the land to which the appeal relates is, or is part of, an agricultural holding",
+    "new-appeal-agricultural-holding-option-no": "(b) (i) The appeal site is, or is part of an agricultural holding, and the appellant is the sole agricultural tenant",
+    "new-appeal-agricultural-holding-option-NA": "(b) (ii) The appeal site is, or is part of, an agricultural holding and the appellant (or the agent) has given the requisite notice to every person (other than the appellant) who, on the day 21 days before the date of the appeal, was a tenant of anagricultural holding on all or part of the land to which the appeal relates as listed below:",
+    "new-appeal-procedure-option-virtual": "Virtual",
+    "new-appeal-procedure-option-inperson": "In person"
 }
\ No newline at end of file
diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js
index a809c7ca..3165624e 100644
--- a/pages/api/endpoint/getappealtypes_api.js
+++ b/pages/api/endpoint/getappealtypes_api.js
@@ -34,8 +34,9 @@ export default async function ApiProxy(req, res) {
     var token = await getToken();
 
     var queryUrl =
-        "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
+        "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Developments of National Significance' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
 
+    console.log(queryUrl);
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
diff --git a/pages/api/endpoint/getmandatoryfields_api.js b/pages/api/endpoint/getmandatoryfields_api.js
index c363fc46..22055046 100644
--- a/pages/api/endpoint/getmandatoryfields_api.js
+++ b/pages/api/endpoint/getmandatoryfields_api.js
@@ -29,6 +29,7 @@ export default async function ApiProxy(req, res) {
         whichForm +
         "')/Attributes?$count=true&$select=LogicalName,RequiredLevel";
 
+    console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
diff --git a/pages/api/endpoint/updatecase_api.js b/pages/api/endpoint/updatecase_api.js
index 44622474..3e636e07 100644
--- a/pages/api/endpoint/updatecase_api.js
+++ b/pages/api/endpoint/updatecase_api.js
@@ -50,8 +50,8 @@ export default async function ApiProxy(req, res) {
         .then(({ data }) => {
             res.status(200).json(data);
         })
-        .catch(({ err }) => {
-            console.log(err);
-            res.status(400).json(err);
+        .catch((error) => {
+            console.log("is it", error);
+            res.status(400);
         });
 }
diff --git a/pages/newappeal/aboutyou.js b/pages/newappeal/aboutyou.js
new file mode 100644
index 00000000..502ace74
--- /dev/null
+++ b/pages/newappeal/aboutyou.js
@@ -0,0 +1,137 @@
+import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import Aboutyou from "../../components/newappeal/aboutyou";
+import CreateCase from "../../components/newappeal/createCase";
+import { wrapper } from "../../store/store";
+
+const AboutYou = (props) => {
+    const { footerLinks, pages, formData } = props;
+    let { t, lang } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const { appealtypes } = router.query;
+
+    const { appealType, LPAData } = props;
+
+    return (
+        <div>
+            <Head>
+                <title>
+                    {t("newappeal:page-title")} - {t("common:service-name")}
+                </title>
+                <>
+                    <link
+                        rel="canonical"
+                        href={t("common:gov-wales-link") + router.asPath}
+                    />
+                    <meta
+                        key="og:locale"
+                        property="og:locale"
+                        content={router.locale}
+                    />
+                    {/* If they have a Twitter Handle, include the meta details below */}
+                    <meta
+                        key="og:site_name"
+                        property="og:site_name"
+                        content={t("common:service-name")}
+                    />
+                    <meta
+                        key="twitter:site"
+                        property="twitter:site"
+                        content="@UKGovWales"
+                    />
+
+                    <meta
+                        name="description"
+                        content={t("common:service-description")}
+                    />
+                    <meta
+                        property="og:site_name"
+                        content={t("common:gov-wales-label")}
+                    />
+                    <meta
+                        property="og:title"
+                        content={t("newappeal:page-title")}
+                    />
+                    <meta
+                        property="og:description"
+                        content={t("common:service-description")}
+                    />
+                    <meta property="og:type" content="website" />
+                    <meta
+                        property="og:url"
+                        content={t("common:gov-wales-link")}
+                    />
+                    <meta
+                        property="og:image"
+                        content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
+                    />
+                    <meta name="twitter:card" content="summary" />
+                    <meta
+                        name="twitter:title"
+                        content={t("common:gov-wales-label")}
+                    />
+                    <meta
+                        name="twitter:url"
+                        content={t("common:gov-wales-link") + router.asPath}
+                    />
+                    <meta
+                        name="twitter:image"
+                        content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
+                    />
+                </>
+            </Head>
+            <div id="page_wrapper">
+                <CookieBanner />
+                <Header courseName={t("common:service-name")} />
+
+                <div className="govuk-width-container">
+                    <Breadcrumbs slug={appealtypes} />
+                    <main
+                        className="govuk-main-wrapper--auto-spacing"
+                        id="main-content"
+                        role="main"
+                    >
+                        <h1>{t("newappeal:about-you-page-title")}</h1>
+                        <Aboutyou />
+                    </main>
+                </div>
+
+                <Footer footerLinks={footerLinks} />
+            </div>
+        </div>
+    );
+};
+
+export const getServerSideProps = wrapper.getServerSideProps(
+    (store) => async (ctx) => {
+        const { req, res } = ctx;
+        const { cookies } = req;
+
+        console.log(cookies);
+
+        let loggedInUser = cookies.pinsUser;
+    }
+);
+
+const mapStateToProps = (state) => {
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        LPAData: state.LPAData,
+        form: state.form,
+        accountDetails: state.accountDetails,
+        govGateway: state.govGateway,
+    };
+};
+
+export default connect(mapStateToProps)(AboutYou);
diff --git a/store/appealType/action.js b/store/appealType/action.js
index 29cf4007..9b62da2c 100644
--- a/store/appealType/action.js
+++ b/store/appealType/action.js
@@ -8,6 +8,7 @@ export const appealTypeDataActionTypes = {
     SETAPPEALLPA: "SETAPPEALLPA",
     SETCASEREFERENCE: "SETCASEREFERENCE",
     SETFORMCOMPLETE: "SETFORMCOMPLETE",
+    SETDOCUMENTLIST: "SETDOCUMENTLIST",
 };
 
 export const getAppealTypeObj = () => (dispatch) => {
@@ -62,3 +63,11 @@ export const setFormComplete = (formComplete) => (dispatch) => {
         formComplete: formComplete,
     });
 };
+
+export const setDocumentsList = (documentList) => (dispatch) => {
+    console.log("here", documentList);
+    return dispatch({
+        type: appealTypeDataActionTypes.SETDOCUMENTLIST,
+        documentList: documentList,
+    });
+};
diff --git a/store/appealType/reducer.js b/store/appealType/reducer.js
index a2e025f4..9b473d52 100644
--- a/store/appealType/reducer.js
+++ b/store/appealType/reducer.js
@@ -8,6 +8,7 @@ const appealTypeDataInitialState = {
     appealLPA: "",
     caseReference: {},
     formComplete: "false",
+    documentList: {},
 };
 
 export default function reducer(state = appealTypeDataInitialState, action) {
@@ -47,6 +48,11 @@ export default function reducer(state = appealTypeDataInitialState, action) {
                 ...state,
                 formComplete: action.formComplete,
             };
+        case appealTypeDataActionTypes.SETDOCUMENTLIST:
+            return {
+                ...state,
+                documentList: action.documentList,
+            };
         default:
             return state;
     }
diff --git a/store/formData/reducer.js b/store/formData/reducer.js
index b36356ac..9bdd1eb1 100644
--- a/store/formData/reducer.js
+++ b/store/formData/reducer.js
@@ -10,10 +10,12 @@ export default function reducer(state = formDataInitialState, action) {
     switch (action.type) {
         case formDataActionTypes.SETFORMDATA:
             return {
+                ...state,
                 formData: action.formData,
                 mandatoryFieldsData: action.mandatoryFieldsData,
                 pickListData: action.pickListData,
             };
+
         default:
             return state;
     }