diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 0cf01a03..c780eb04 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -134,6 +134,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    date_source_type: {
+        edit: true,
+        verify: true,
+    },
+    date_source_links: {
+        edit: true,
+        verify: true,
+    },
     facade_year: {
         edit: true,
         verify: true,
diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index 3d0c4cb7..47d2459e 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -103,6 +103,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.facade_year}
                     verified_count={props.building.verified.facade_year}
                     />
+                <hr/>
                 <SelectDataEntry
                     title={dataFields.date_source.title}
                     slug="date_source"
@@ -132,13 +133,43 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         />
                     </>
                 }
-                <DataEntry
+                <hr/>
+                <SelectDataEntry
+                    title={dataFields.date_source_type.title}
+                    slug="date_source_type"
+                    value={props.building.date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.date_source_type.tooltip}
+                    options={dataFields.date_source_type.items}
+                    placeholder={dataFields.date_source_type.example}
+                    />
+                {(props.building.date_source_type == dataFields.date_source_type.items[0] ||
+                    props.building.date_source_type == dataFields.date_source_type.items[1] ||
+                    props.building.date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.date_source_links.title}
+                            slug="date_source_links"
+                            value={props.building.date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                {/*<DataEntry
                     title="Year of completion (best estimate)"
                     slug=""
                     value=""
                     mode='view'
                     tooltip='Coming Soon'
-                />
+                />*/}
             </DataEntryGroup>
             <DataEntryGroup name="Cladding, extensions and retrofits">
                 <NumericDataEntry
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 154b98db..617fda6f 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -362,7 +362,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_source: {
         category: Category.Age,
-        title: "Source type",
+        title: "Historical source type",
         tooltip: "Source type for the building dates above",
         items: [
             "Expert knowledge of building",
@@ -389,6 +389,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "",
     },
     date_link: {
+        category: Category.Age,
+        title: "Historical source link(s)",
+        tooltip: "URL for age and date reference",
+        example: ["", "", ""],
+    },
+    date_source_type: {
+        category: Category.Age,
+        title: "Source type",
+        tooltip: "Source type for the building dates above",
+        items: commonSourceTypes,
+        example: "",
+    },
+    date_source_links: {
         category: Category.Age,
         title: "Source link(s)",
         tooltip: "URL for age and date reference",
diff --git a/migrations/041.ui_revamp_tweaks.up.sql b/migrations/041.ui_revamp_tweaks.up.sql
index 716b84f9..dce58c01 100644
--- a/migrations/041.ui_revamp_tweaks.up.sql
+++ b/migrations/041.ui_revamp_tweaks.up.sql
@@ -17,4 +17,7 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS energy_green_roof_source_links te
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_crowdsourced_site_completion_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_crowdsourced_site_completion_source_links text[];
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_missing_data boolean;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_missing_data_links text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_missing_data_links text[];
+
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS date_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS date_source_links text[];
\ No newline at end of file