diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/PremisesEntity.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/PremisesEntity.kt
index fa02bca2aa..d1f283a6d4 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/PremisesEntity.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/PremisesEntity.kt
@@ -203,6 +203,7 @@ interface ApprovedPremisesRepository : JpaRepository<ApprovedPremisesEntity, UUI
   fun findByQCode(qcode: String): ApprovedPremisesEntity?
 }
 
+@SuppressWarnings("LongParameterList")
 @Entity
 @Table(name = "premises")
 @DiscriminatorColumn(name = "service")
@@ -211,8 +212,17 @@ abstract class PremisesEntity(
   @Id
   val id: UUID,
   var name: String,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var addressLine1: String,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var addressLine2: String?,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var town: String?,
   var postcode: String,
   var longitude: Double?,
@@ -273,6 +283,12 @@ class ApprovedPremisesEntity(
   var gender: ApprovedPremisesGender,
   var supportsSpaceBookings: Boolean,
   var managerDetails: String?,
+  /**
+   * Full Address, excluding postcode. When defined this should be used instead of [addressLine1], [addressLine2] and [town]
+   *
+   * Whilst currently nullable, once all site surveys have been imported this can be made non-null
+   */
+  var fullAddress: String?,
 ) : PremisesEntity(
   id,
   name,
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/cas1/Cas1PremisesSearchRepository.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/cas1/Cas1PremisesSearchRepository.kt
index 2e5e7a71be..8789e019e0 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/cas1/Cas1PremisesSearchRepository.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/cas1/Cas1PremisesSearchRepository.kt
@@ -54,6 +54,7 @@ FROM
       ELSE 'NORMAL'
     END AS ap_type,
     p.name AS name,
+    ap.full_address AS full_address,
     p.address_line1 AS address_line1,
     p.address_line2 AS address_line2,
     p.town AS town,
@@ -70,7 +71,7 @@ FROM
   WHERE 
     ap.supports_space_bookings = true AND
     ap.gender = #SPECIFIED_GENDER#
-  GROUP BY p.id, ap.point, p.name, p.address_line1, p.address_line2, p.town, p.postcode, aa.id, aa.name  
+  GROUP BY p.id, ap.point, p.name, ap.full_address, p.address_line1, p.address_line2, p.town, p.postcode, aa.id, aa.name  
 ) AS result
 WHERE
   1 = 1
@@ -110,6 +111,7 @@ class Cas1SpaceSearchRepository(
         rs.getFloat("distance_in_miles"),
         apType,
         rs.getString("name"),
+        rs.getString("full_address"),
         rs.getString("address_line1"),
         rs.getString("address_line2"),
         rs.getString("town"),
@@ -204,6 +206,7 @@ data class CandidatePremises(
   val distanceInMiles: Float,
   val apType: ApprovedPremisesType,
   val name: String,
+  val fullAddress: String?,
   val addressLine1: String,
   val addressLine2: String?,
   val town: String?,
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromCsvJob.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromCsvJob.kt
index 1c0263666e..2dd745a388 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromCsvJob.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromCsvJob.kt
@@ -62,6 +62,7 @@ class Cas1SeedPremisesFromCsvJob(
     "gender",
     "supportsSpaceBookings",
     "managerDetails",
+    "fullAddress",
   ),
 ) {
   private val log = LoggerFactory.getLogger(this::class.java)
@@ -109,6 +110,7 @@ class Cas1SeedPremisesFromCsvJob(
     gender = ApprovedPremisesGender.valueOf(columns["gender"]!!),
     supportsSpaceBookings = parseBooleanStringOrThrow(columns["supportsSpaceBookings"]!!, "supportsSpaceBookings"),
     managerDetails = columns["managerDetails"]!!,
+    fullAddress = columns["fullAddress"],
   )
 
   @SuppressWarnings("TooGenericExceptionThrown")
@@ -192,6 +194,7 @@ class Cas1SeedPremisesFromCsvJob(
         gender = row.gender,
         supportsSpaceBookings = castBooleanString(row.supportsSpaceBookings),
         managerDetails = row.managerDetails,
+        fullAddress = row.fullAddress,
       ),
     )
 
@@ -225,6 +228,7 @@ class Cas1SeedPremisesFromCsvJob(
       this.name = row.name
       this.apCode = row.apCode
       this.qCode = row.qCode
+      this.fullAddress = row.fullAddress
       this.addressLine1 = row.addressLine1
       this.addressLine2 = row.addressLine2
       this.town = row.town
@@ -294,4 +298,5 @@ data class ApprovedPremisesSeedCsvRow(
   val gender: ApprovedPremisesGender,
   val supportsSpaceBookings: String,
   val managerDetails: String,
+  val fullAddress: String?,
 )
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromSiteSurveyXlsxJob.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromSiteSurveyXlsxJob.kt
index a7584bc98f..6d28481570 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromSiteSurveyXlsxJob.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromSiteSurveyXlsxJob.kt
@@ -131,6 +131,9 @@ class Cas1SeedPremisesFromSiteSurveyXlsxJob(
       ApprovedPremisesEntity(
         id = UUID.randomUUID(),
         name = siteSurvey.name,
+        fullAddress = premisesInfo.siteSurveyPremise.address,
+        // note that the site survey provides a full address in this field
+        // so callers should retrieve fullAddress instead
         addressLine1 = siteSurvey.address,
         addressLine2 = null,
         town = siteSurvey.townCity,
@@ -173,6 +176,7 @@ class Cas1SeedPremisesFromSiteSurveyXlsxJob(
     val siteSurvey = premisesInfo.siteSurveyPremise
     existingPremise.apply {
       name = siteSurvey.name
+      fullAddress = premisesInfo.siteSurveyPremise.address
       addressLine1 = siteSurvey.address
       addressLine2 = null
       town = siteSurvey.townCity
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/transformer/cas1/Cas1SpaceSearchResultsTransformer.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/transformer/cas1/Cas1SpaceSearchResultsTransformer.kt
index 3d948a5e5b..7729016be9 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/transformer/cas1/Cas1SpaceSearchResultsTransformer.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/transformer/cas1/Cas1SpaceSearchResultsTransformer.kt
@@ -27,6 +27,7 @@ class Cas1SpaceSearchResultsTransformer {
             id = candidatePremises.premisesId,
             apType = candidatePremises.apType.asApiType(),
             name = candidatePremises.name,
+            fullAddress = candidatePremises.resolveFullAddress(),
             addressLine1 = candidatePremises.addressLine1,
             addressLine2 = candidatePremises.addressLine2,
             town = candidatePremises.town,
@@ -50,4 +51,11 @@ class Cas1SpaceSearchResultsTransformer {
         )
       },
     )
+
+  fun CandidatePremises.resolveFullAddress(): String {
+    return fullAddress
+      ?: listOf(addressLine1, addressLine2, town)
+        .filter { !it.isNullOrBlank() }
+        .joinToString(separator = ", ")
+  }
 }
diff --git a/src/main/resources/db/migration/all/20241223095926__add_approved_premises_full_address.sql b/src/main/resources/db/migration/all/20241223095926__add_approved_premises_full_address.sql
new file mode 100644
index 0000000000..e6565f42d1
--- /dev/null
+++ b/src/main/resources/db/migration/all/20241223095926__add_approved_premises_full_address.sql
@@ -0,0 +1 @@
+ALTER TABLE approved_premises ADD full_address text NULL;
diff --git a/src/main/resources/db/seed/local+dev+test/1__approved_premises.csv b/src/main/resources/db/seed/local+dev+test/1__approved_premises.csv
index bc9b9ffadc..66f9fb24ce 100644
--- a/src/main/resources/db/seed/local+dev+test/1__approved_premises.csv
+++ b/src/main/resources/db/seed/local+dev+test/1__approved_premises.csv
@@ -1,19 +1,19 @@
-name,addressLine1,addressLine2,town,postcode,latitude,longitude,notes,emailAddress,probationRegion,localAuthorityArea,characteristics,isIAP,isPIPE,isESAP,isSemiSpecialistMentalHealth,isRecoveryFocussed,isSuitableForVulnerable,acceptsSexOffenders,acceptsChildSexOffenders,acceptsNonSexualChildOffenders,acceptsHateCrimeOffenders,isCatered,hasWideStepFreeAccess,hasWideAccessToCommunalAreas,hasStepFreeAccessToCommunalAreas,hasWheelChairAccessibleBathrooms,hasLift,hasTactileFlooring,hasBrailleSignage,hasHearingLoop,status,apCode,qCode,gender,supportsSpaceBookings,managerDetails
-LON Men Premise 1,454 Nader Port,,Quitzonview,OX26 2EQ,51.904735,-1.1635,No,some@emailaddress.com,London,Hackney,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,NO,NO,NO,YES,active,LONMEN1,Q714,MAN,NO,Manager for LON Men Premise 1
-LON Men Premise 2,7525 Alba Trail,,Theronborough,WA6 9BQ,53.266459,-2.768905,,some@emailaddress.com,London,Westminster,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,active,LONMEN2,Q703,MAN,NO,Manager for LON Men Premise 2
-MIDS Men Premise 1,8527 Bell Rapids,,South Myah,ML8 5EP,55.751711,-3.851103,restrictions on offences against sex workers due to location of the AP,some@emailaddress.com,East Midlands,Leicester,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,active,MIDSMEN1,Q701,MAN,NO,Manager for MIDS Men Premise 1
-MIDS Men Premise 2,306 Destinee Union,,South Devinberg,KA4 8JG,55.599949,-4.376498,,some@emailaddress.com,West Midlands,Birmingham,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,YES,YES,active,MIDSMEN2,Q702,MAN,NO,Manager for MIDS Men Premise 2
-NE Men Premise 1,4023 Green Wells,,Port Carleton,N14 6QW,51.631685,-0.125257,"As an independent AP, cannot take Arsonists who post an imminent risk of further Arson. This is a local decision, I confirmed that there was no insurance issues regarding Arson. The manager just said if there was an Arsonist whose risk was seen as imminent, she would have to check with the Charity who funds the AP",some@emailaddress.com,North East,Newcastle upon Tyne,,YES,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,NO,active,NEMEN1,Q705,MAN,NO,Manager for NE Manager for Men Premise 1
-NE Men Premise 2,42716 Dickens Route,,Bayerstead,WA11 8GJ,53.50205,-2.790471,,some@emailaddress.com,North East,Sunderland,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,NO,YES,active,NEMEN2,Q706,MAN,NO,Manager for NE Men Premise 2
-NE Men Premise 3,704 Eleazar Rue,,Bergstromfort,SK11 6TG,53.254466,-2.124048,,some@emailaddress.com,North East,Sunderland,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,active,NEMEN3,Q707,MAN,NO,Manager for NE Men Premise 3
-NE Women Premise 1,069 Braun Flat,,Roobbury,SO15 8PN,50.913966,-1.442888,,some@emailaddress.com,North East,Newcastle upon Tyne,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,NEWOMEN1,Q708,WOMAN,NO,Manager for NE Women Premise 1
-NW Men Premise 1,14063 Edyth Court,,North Hallie,LN13 9AT,53.254737,0.180603,No,some@emailaddress.com,North West,Lancaster,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN1,Q709,MAN,NO,Manager for NW Men Premise 1
-NW Men Premise 2,9317 Bauch Heights,,Mavisworth,TN33 9JN,50.886096,0.424608,No Child RSO's since 2006 - National instruction.,some@emailaddress.com,North West,Carlisle,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN2,Q710,MAN,NO,Manager for NW Men Premise 2
-SEE Men Premise 1,5510 Emmitt Street,,North Gregoryboro,SA13 1NN,51.593159,-3.781082,Rooms 9 to 16 are currently out of use - annexe that contains them is subsiding and is non accessible - for last 6 months or so.,some@emailaddress.com,East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,YES,YES,active,SEEMEN1,Q711,MAN,NO,Manager for SEE Men Premise 1
-SEE Men Premise 2,307 Annabell Flats,,Zemlaktown,GU34 5EB,51.119205,-1.040455,,some@emailaddress.com,East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,NO,active,SEEMEN2,Q712,MAN,NO,Manager for SEE Men Premise 2
-SWSC Men Premise 1,110 Bailey Expressway,,Cordellburgh,GU3 3DZ,51.249544,-0.637553,,some@emailaddress.com,South West,Southampton,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,active,SWSCMEN1,Q005,MAN,YES,Manager for SWSC Men Premise 1
-SWSC Men Premise 2,0300 Blick Camp,,North Moriahhaven,HU11 4XH,53.792705,-0.191504,Westgate notes,some@emailaddress.com,South Central,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN2,Q095,MAN,YES,Manager for SWSC Men Premise 2
-SWSC Men Premise 3,4169 Joana Branch,,Alfredohaven,IV30 1XX,57.644221,-3.295377,TEST notes,some@emailaddress.com,South West,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN3,Q713,MAN,YES,Manager for SWSC Men Premise 3
-SWSC Women Premise 1,12 Aardvark Branch,,Mavisworth,JJ30 YXX,57.144221,-3.195377,TEST notes,some@emailaddress.com,South Central,Southampton,,NO,YES,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCWOMEN1,Q049,WOMAN,YES,Manager for SWSC Women Premise 1
-Wales Men Premise 1,3 Blackbird Heights,,South Myah,XX33 9AN,50.286096,0.524608,,some@emailaddress.com,Wales,Newport,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN1,Q715,MAN,NO,Manager for Wales Men Premise 1
-Wales Men Premise 2,98 Crow Court,,Quitzonview,AB13 9AT,53.284737,0.190603,No,some@emailaddress.com,Wales,Cardiff,,YES,NO,YES,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN2,Q716,MAN,NO,Manager for Wales Men Premise 2
\ No newline at end of file
+name,addressLine1,addressLine2,town,postcode,latitude,longitude,notes,emailAddress,probationRegion,localAuthorityArea,characteristics,isIAP,isPIPE,isESAP,isSemiSpecialistMentalHealth,isRecoveryFocussed,isSuitableForVulnerable,acceptsSexOffenders,acceptsChildSexOffenders,acceptsNonSexualChildOffenders,acceptsHateCrimeOffenders,isCatered,hasWideStepFreeAccess,hasWideAccessToCommunalAreas,hasStepFreeAccessToCommunalAreas,hasWheelChairAccessibleBathrooms,hasLift,hasTactileFlooring,hasBrailleSignage,hasHearingLoop,status,apCode,qCode,gender,supportsSpaceBookings,managerDetails,fullAddress
+LON Men Premise 1,454 Nader Port,,Quitzonview,OX26 2EQ,51.904735,-1.1635,No,some@emailaddress.com,London,Hackney,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,NO,NO,NO,YES,active,LONMEN1,Q714,MAN,NO,Manager for LON Men Premise 1,"454 Nader Port, Quitzonview"
+LON Men Premise 2,7525 Alba Trail,,Theronborough,WA6 9BQ,53.266459,-2.768905,,some@emailaddress.com,London,Westminster,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,active,LONMEN2,Q703,MAN,NO,Manager for LON Men Premise 2,7525 Alba Trail
+MIDS Men Premise 1,8527 Bell Rapids,,South Myah,ML8 5EP,55.751711,-3.851103,restrictions on offences against sex workers due to location of the AP,some@emailaddress.com,East Midlands,Leicester,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,active,MIDSMEN1,Q701,MAN,NO,Manager for MIDS Men Premise 1,"8527 Bell Rapids, South Myah"
+MIDS Men Premise 2,306 Destinee Union,,South Devinberg,KA4 8JG,55.599949,-4.376498,,some@emailaddress.com,West Midlands,Birmingham,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,YES,YES,active,MIDSMEN2,Q702,MAN,NO,Manager for MIDS Men Premise 2,"306 Destinee Union, South Devinberg"
+NE Men Premise 1,4023 Green Wells,,Port Carleton,N14 6QW,51.631685,-0.125257,"As an independent AP, cannot take Arsonists who post an imminent risk of further Arson. This is a local decision, I confirmed that there was no insurance issues regarding Arson. The manager just said if there was an Arsonist whose risk was seen as imminent, she would have to check with the Charity who funds the AP",some@emailaddress.com,North East,Newcastle upon Tyne,,YES,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,NO,active,NEMEN1,Q705,MAN,NO,Manager for NE Manager for Men Premise 1,"4023 Green Wells, Port Carleton"
+NE Men Premise 2,42716 Dickens Route,,Bayerstead,WA11 8GJ,53.50205,-2.790471,,some@emailaddress.com,North East,Sunderland,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,NO,YES,active,NEMEN2,Q706,MAN,NO,Manager for NE Men Premise 2,"42716 Dickens Route, Bayerstead"
+NE Men Premise 3,704 Eleazar Rue,,Bergstromfort,SK11 6TG,53.254466,-2.124048,,some@emailaddress.com,North East,Sunderland,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,active,NEMEN3,Q707,MAN,NO,Manager for NE Men Premise 3,"704 Eleazar Rue, Bergstromfort"
+NE Women Premise 1,069 Braun Flat,,Roobbury,SO15 8PN,50.913966,-1.442888,,some@emailaddress.com,North East,Newcastle upon Tyne,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,NEWOMEN1,Q708,WOMAN,NO,Manager for NE Women Premise 1,"069 Braun Flat, Roobbury"
+NW Men Premise 1,14063 Edyth Court,,North Hallie,LN13 9AT,53.254737,0.180603,No,some@emailaddress.com,North West,Lancaster,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN1,Q709,MAN,NO,Manager for NW Men Premise 1,"14063 Edyth Court, North Hallie"
+NW Men Premise 2,9317 Bauch Heights,,Mavisworth,TN33 9JN,50.886096,0.424608,No Child RSO's since 2006 - National instruction.,some@emailaddress.com,North West,Carlisle,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN2,Q710,MAN,NO,Manager for NW Men Premise 2,"9317 Bauch Heights, Mavisworth"
+SEE Men Premise 1,5510 Emmitt Street,,North Gregoryboro,SA13 1NN,51.593159,-3.781082,Rooms 9 to 16 are currently out of use - annexe that contains them is subsiding and is non accessible - for last 6 months or so.,some@emailaddress.com,East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,YES,YES,active,SEEMEN1,Q711,MAN,NO,Manager for SEE Men Premise 1,"5510 Emmitt Street, North Gregoryboro"
+SEE Men Premise 2,307 Annabell Flats,,Zemlaktown,GU34 5EB,51.119205,-1.040455,,some@emailaddress.com,East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,NO,active,SEEMEN2,Q712,MAN,NO,Manager for SEE Men Premise 2,"307 Annabell Flats, Zemlaktown"
+SWSC Men Premise 1,110 Bailey Expressway,,Cordellburgh,GU3 3DZ,51.249544,-0.637553,,some@emailaddress.com,South West,Southampton,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,active,SWSCMEN1,Q005,MAN,YES,Manager for SWSC Men Premise 1,"110 Bailey Expressway, Cordellburgh"
+SWSC Men Premise 2,0300 Blick Camp,,North Moriahhaven,HU11 4XH,53.792705,-0.191504,Westgate notes,some@emailaddress.com,South Central,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN2,Q095,MAN,YES,Manager for SWSC Men Premise 2,"0300 Blick Camp, North Moriahhaven"
+SWSC Men Premise 3,4169 Joana Branch,,Alfredohaven,IV30 1XX,57.644221,-3.295377,TEST notes,some@emailaddress.com,South West,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN3,Q713,MAN,YES,Manager for SWSC Men Premise 3,"4169 Joana Branch, Alfredohaven"
+SWSC Women Premise 1,12 Aardvark Branch,,Mavisworth,JJ30 YXX,57.144221,-3.195377,TEST notes,some@emailaddress.com,South Central,Southampton,,NO,YES,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCWOMEN1,Q049,WOMAN,YES,Manager for SWSC Women Premise 1,"12 Aardvark Branch, Mavisworth"
+Wales Men Premise 1,3 Blackbird Heights,,South Myah,XX33 9AN,50.286096,0.524608,,some@emailaddress.com,Wales,Newport,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN1,Q715,MAN,NO,Manager for Wales Men Premise 1,"3 Blackbird Heights, South Myah"
+Wales Men Premise 2,98 Crow Court,,Quitzonview,AB13 9AT,53.284737,0.190603,No,some@emailaddress.com,Wales,Cardiff,,YES,NO,YES,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN2,Q716,MAN,NO,Manager for Wales Men Premise 2,"98 Crow Court, Quitzonview"
\ No newline at end of file
diff --git a/src/main/resources/static/cas1-schemas.yml b/src/main/resources/static/cas1-schemas.yml
index fa33126998..e94400829e 100644
--- a/src/main/resources/static/cas1-schemas.yml
+++ b/src/main/resources/static/cas1-schemas.yml
@@ -36,13 +36,22 @@ components:
         name:
           type: string
           example: Hope House
+        fullAddress:
+          description: Full address, excluding postcode
+          type: string
         addressLine1:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: 1 The Street
         addressLine2:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Blackmore End
         town:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Braintree
         postcode:
@@ -66,6 +75,7 @@ components:
         - name
         - apArea
         - characteristics
+        - fullAddress
     Cas1PremisesSummary:
       type: object
       properties:
diff --git a/src/main/resources/static/codegen/built-cas1-api-spec.yml b/src/main/resources/static/codegen/built-cas1-api-spec.yml
index 137896e95f..b59702f8f9 100644
--- a/src/main/resources/static/codegen/built-cas1-api-spec.yml
+++ b/src/main/resources/static/codegen/built-cas1-api-spec.yml
@@ -6086,13 +6086,22 @@ components:
         name:
           type: string
           example: Hope House
+        fullAddress:
+          description: Full address, excluding postcode
+          type: string
         addressLine1:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: 1 The Street
         addressLine2:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Blackmore End
         town:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Braintree
         postcode:
@@ -6116,6 +6125,7 @@ components:
         - name
         - apArea
         - characteristics
+        - fullAddress
     Cas1PremisesSummary:
       type: object
       properties:
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/factory/ApprovedPremisesEntityFactory.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/factory/ApprovedPremisesEntityFactory.kt
index 26b61ebcb8..17534a9648 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/factory/ApprovedPremisesEntityFactory.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/factory/ApprovedPremisesEntityFactory.kt
@@ -25,6 +25,7 @@ class ApprovedPremisesEntityFactory : Factory<ApprovedPremisesEntity> {
   private var localAuthorityArea: Yielded<LocalAuthorityAreaEntity>? = null
   private var id: Yielded<UUID> = { UUID.randomUUID() }
   private var name: Yielded<String> = { randomStringMultiCaseWithNumbers(8) }
+  private var fullAddress: Yielded<String?> = { randomStringUpperCase(10) }
   private var apCode: Yielded<String> = { randomStringUpperCase(10) }
   private var postcode: Yielded<String> = { randomPostCode() }
   private var latitude: Yielded<Double> = { randomDouble(53.50, 54.99) }
@@ -57,6 +58,10 @@ class ApprovedPremisesEntityFactory : Factory<ApprovedPremisesEntity> {
     this.name = { name }
   }
 
+  fun withFullAddress(fullAddress: String?) = apply {
+    this.fullAddress = { fullAddress }
+  }
+
   fun withApCode(apCode: String) = apply {
     this.apCode = { apCode }
   }
@@ -202,5 +207,6 @@ class ApprovedPremisesEntityFactory : Factory<ApprovedPremisesEntity> {
     gender = this.gender(),
     supportsSpaceBookings = this.supportsSpaceBookings(),
     managerDetails = this.managerDetails(),
+    fullAddress = this.fullAddress(),
   )
 }
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/Cas1SpaceSearchTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/Cas1SpaceSearchTest.kt
index cdccc7c4a9..0e625aa69d 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/Cas1SpaceSearchTest.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/Cas1SpaceSearchTest.kt
@@ -350,6 +350,7 @@ class Cas1SpaceSearchTest : InitialiseDatabasePerClassTestBase() {
     assertThat(premises.id).isEqualTo(expected.id)
     assertThat(premises.apType).isEqualTo(expectedApType)
     assertThat(premises.name).isEqualTo(expected.name)
+    assertThat(premises.fullAddress).isEqualTo(expected.fullAddress)
     assertThat(premises.addressLine1).isEqualTo(expected.addressLine1)
     assertThat(premises.addressLine2).isEqualTo(expected.addressLine2)
     assertThat(premises.town).isEqualTo(expected.town)
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/Cas1SeedPremisesFromCsvTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/Cas1SeedPremisesFromCsvTest.kt
index d051a99d8e..edb0aa2b1e 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/Cas1SeedPremisesFromCsvTest.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/Cas1SeedPremisesFromCsvTest.kt
@@ -202,7 +202,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
       "acceptsNonSexualChildOffenders, acceptsHateCrimeOffenders, isCatered, hasWideStepFreeAccess, " +
       "hasWideAccessToCommunalAreas, hasStepFreeAccessToCommunalAreas, hasWheelChairAccessibleBathrooms, " +
       "hasLift, hasTactileFlooring, hasBrailleSignage, hasHearingLoop, status, latitude, longitude, gender, " +
-      "supportsSpaceBookings, managerDetails]"
+      "supportsSpaceBookings, managerDetails, fullAddress]"
 
     assertThat(logEntries)
       .withFailMessage("-> logEntries actually contains: $logEntries")
@@ -235,6 +235,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
     }
 
     val csvRow = ApprovedPremisesSeedCsvRowFactory()
+      .withFullAddress("The full address")
       .withProbationRegion(probationRegion.name)
       .withLocalAuthorityArea(localAuthorityArea.name)
       .withIsCatered("yes")
@@ -260,6 +261,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
     assertThat(persistedApprovedPremises).isNotNull
     assertThat(persistedApprovedPremises!!.apCode).isEqualTo(csvRow.apCode)
     assertThat(persistedApprovedPremises.name).isEqualTo(csvRow.name)
+    assertThat(persistedApprovedPremises.fullAddress).isEqualTo("The full address")
     assertThat(persistedApprovedPremises.addressLine1).isEqualTo(csvRow.addressLine1)
     assertThat(persistedApprovedPremises.addressLine2).isEqualTo(csvRow.addressLine2)
     assertThat(persistedApprovedPremises.town).isEqualTo(csvRow.town)
@@ -372,6 +374,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
         "gender",
         "supportsSpaceBookings",
         "managerDetails",
+        "fullAddress",
       )
       .newRow()
 
@@ -413,6 +416,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
         .withQuotedField(it.gender)
         .withQuotedField(it.supportsSpaceBookings)
         .withQuotedField(it.managerDetails)
+        .withQuotedField(it.fullAddress ?: "")
         .newRow()
     }
 
@@ -422,6 +426,7 @@ class Cas1SeedPremisesFromCsvTest : SeedTestBase() {
 
 class ApprovedPremisesSeedCsvRowFactory : Factory<ApprovedPremisesSeedCsvRow> {
   private var name: Yielded<String> = { randomStringMultiCaseWithNumbers(10) }
+  private var fullAddress: Yielded<String?> = { null }
   private var addressLine1: Yielded<String> = { randomStringMultiCaseWithNumbers(10) }
   private var addressLine2: Yielded<String?> = { randomStringMultiCaseWithNumbers(10) }
   private var town: Yielded<String> = { randomStringMultiCaseWithNumbers(10) }
@@ -462,6 +467,10 @@ class ApprovedPremisesSeedCsvRowFactory : Factory<ApprovedPremisesSeedCsvRow> {
     this.name = { name }
   }
 
+  fun withFullAddress(fullAddress: String?) = apply {
+    this.fullAddress = { fullAddress }
+  }
+
   fun withAddressLine1(addressLine1: String) = apply {
     this.addressLine1 = { addressLine1 }
   }
@@ -523,6 +532,7 @@ class ApprovedPremisesSeedCsvRowFactory : Factory<ApprovedPremisesSeedCsvRow> {
 
   override fun produce() = ApprovedPremisesSeedCsvRow(
     name = this.name(),
+    fullAddress = this.fullAddress(),
     addressLine1 = this.addressLine1(),
     addressLine2 = this.addressLine2(),
     town = this.town(),
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/SeedCas1PremiseFromSiteSurveyXlsxTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/SeedCas1PremiseFromSiteSurveyXlsxTest.kt
index 59dca3ee42..7c9c39b0d0 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/SeedCas1PremiseFromSiteSurveyXlsxTest.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/seed/SeedCas1PremiseFromSiteSurveyXlsxTest.kt
@@ -36,7 +36,7 @@ class SeedCas1PremiseFromSiteSurveyXlsxTest : SeedTestBase() {
       "Probation Region", "Yorks & The Humber",
       "Local Authority Area", "Bournemouth",
       "Town / City", "Narnia",
-      "Address", "123 Made Up Town",
+      "Address", "123 Made Up Town, Narnia",
       "Postcode", "LE12 ABC",
       "Male / Female AP?", "Male",
       "Total number of beds (including any beds out of service)", "22",
@@ -74,7 +74,8 @@ class SeedCas1PremiseFromSiteSurveyXlsxTest : SeedTestBase() {
 
     val createdPremise = approvedPremisesRepository.findByQCode("Q123")!!
     assertThat(createdPremise.name).isEqualTo("The Premise Name")
-    assertThat(createdPremise.addressLine1).isEqualTo("123 Made Up Town")
+    assertThat(createdPremise.addressLine1).isEqualTo("123 Made Up Town, Narnia")
+    assertThat(createdPremise.addressLine1).isEqualTo("123 Made Up Town, Narnia")
     assertThat(createdPremise.addressLine2).isNull()
     assertThat(createdPremise.town).isEqualTo("Narnia")
     assertThat(createdPremise.postcode).isEqualTo("LE12 ABC")
@@ -194,6 +195,7 @@ class SeedCas1PremiseFromSiteSurveyXlsxTest : SeedTestBase() {
     val existingPremises = approvedPremisesEntityFactory.produceAndPersist {
       withQCode("QExisting")
       withName("Old Name")
+      withFullAddress("Old Full Address")
       withAddressLine1("Old Address Line 1")
       withAddressLine2("Old Address Line 2")
       withTown("Old Town")
@@ -239,7 +241,7 @@ class SeedCas1PremiseFromSiteSurveyXlsxTest : SeedTestBase() {
       "Probation Region", "Yorks & The Humber",
       "Local Authority Area", "Windsor and Maidenhead",
       "Town / City", "Narnia",
-      "Address", "123 Made Up Town",
+      "Address", "123 Made Up Town, Narnia",
       "Postcode", "LE12 ABC",
       "Male / Female AP?", "Male",
       "Total number of beds (including any beds out of service)", "22",
@@ -277,7 +279,8 @@ class SeedCas1PremiseFromSiteSurveyXlsxTest : SeedTestBase() {
 
     val createdPremise = approvedPremisesRepository.findByQCode("QExisting")!!
     assertThat(createdPremise.name).isEqualTo("The Premise Name")
-    assertThat(createdPremise.addressLine1).isEqualTo("123 Made Up Town")
+    assertThat(createdPremise.fullAddress).isEqualTo("123 Made Up Town, Narnia")
+    assertThat(createdPremise.addressLine1).isEqualTo("123 Made Up Town, Narnia")
     assertThat(createdPremise.addressLine2).isNull()
     assertThat(createdPremise.town).isEqualTo("Narnia")
     assertThat(createdPremise.postcode).isEqualTo("LE12 ABC")
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1SpaceSearchServiceTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1SpaceSearchServiceTest.kt
index de65d4a7c4..5a52002097 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1SpaceSearchServiceTest.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/service/cas1/Cas1SpaceSearchServiceTest.kt
@@ -86,6 +86,7 @@ class Cas1SpaceSearchServiceTest {
       1.0f,
       ApprovedPremisesType.NORMAL,
       "Some AP",
+      fullAddress = "the full address",
       "1 The Street",
       null,
       "Townsbury",
@@ -100,6 +101,7 @@ class Cas1SpaceSearchServiceTest {
       2.0f,
       ApprovedPremisesType.ESAP,
       "Some Other AP",
+      fullAddress = "the full address",
       "2 The Street",
       null,
       "Townsbury",
@@ -114,6 +116,7 @@ class Cas1SpaceSearchServiceTest {
       3.0f,
       ApprovedPremisesType.PIPE,
       "Some AP",
+      fullAddress = "the full address",
       "3 The Street",
       null,
       "Townsbury",
@@ -196,6 +199,7 @@ class Cas1SpaceSearchServiceTest {
       1.0f,
       ApprovedPremisesType.NORMAL,
       "Some AP",
+      fullAddress = "the full address",
       "1 The Street",
       null,
       "Townsbury",
@@ -210,6 +214,7 @@ class Cas1SpaceSearchServiceTest {
       2.0f,
       ApprovedPremisesType.ESAP,
       "Some Other AP",
+      fullAddress = "the full address",
       "2 The Street",
       null,
       "Townsbury",
@@ -224,6 +229,7 @@ class Cas1SpaceSearchServiceTest {
       3.0f,
       ApprovedPremisesType.PIPE,
       "Some AP",
+      fullAddress = "the full address",
       "3 The Street",
       null,
       "Townsbury",
@@ -298,6 +304,7 @@ class Cas1SpaceSearchServiceTest {
       1.0f,
       ApprovedPremisesType.NORMAL,
       "Some AP",
+      fullAddress = "the full address",
       "1 The Street",
       null,
       "Townsbury",
@@ -312,6 +319,7 @@ class Cas1SpaceSearchServiceTest {
       2.0f,
       ApprovedPremisesType.ESAP,
       "Some Other AP",
+      fullAddress = "the full address",
       "2 The Street",
       null,
       "Townsbury",
@@ -326,6 +334,7 @@ class Cas1SpaceSearchServiceTest {
       3.0f,
       ApprovedPremisesType.PIPE,
       "Some AP",
+      fullAddress = "the full address",
       "3 The Street",
       null,
       "Townsbury",
@@ -399,6 +408,7 @@ class Cas1SpaceSearchServiceTest {
       1.0f,
       ApprovedPremisesType.NORMAL,
       "Some AP",
+      fullAddress = "the full address",
       "1 The Street",
       null,
       "Townsbury",
@@ -413,6 +423,7 @@ class Cas1SpaceSearchServiceTest {
       2.0f,
       ApprovedPremisesType.ESAP,
       "Some Other AP",
+      fullAddress = "the full address",
       "2 The Street",
       null,
       "Townsbury",
@@ -427,6 +438,7 @@ class Cas1SpaceSearchServiceTest {
       3.0f,
       ApprovedPremisesType.PIPE,
       "Some AP",
+      fullAddress = "the full address",
       "3 The Street",
       null,
       "Townsbury",
@@ -512,7 +524,6 @@ class Cas1SpaceSearchServiceTest {
     @JvmStatic
     fun spaceCharacteristicArgs(): Stream<Arguments> = generateListEnumArgs<Cas1SpaceCharacteristic>()
 
-    @OptIn(ExperimentalStdlibApi::class)
     private inline fun <reified T : Enum<T>> generateListEnumArgs(): Stream<Arguments> = Stream.concat(
       enumEntries<T>().map { Arguments.of(listOf(it)) }.stream(),
       Stream.of(Arguments.of(enumEntries<T>())),
diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1SpaceSearchResultsTransformerTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1SpaceSearchResultsTransformerTest.kt
index 41094ae7ae..2a66808aeb 100644
--- a/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1SpaceSearchResultsTransformerTest.kt
+++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/unit/transformer/cas1/Cas1SpaceSearchResultsTransformerTest.kt
@@ -9,11 +9,10 @@ import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.Cas1SpaceSearc
 import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.Gender
 import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.cas1.CandidatePremises
 import uk.gov.justice.digital.hmpps.approvedpremisesapi.model.ApprovedPremisesType
-import uk.gov.justice.digital.hmpps.approvedpremisesapi.model.asApiType
 import uk.gov.justice.digital.hmpps.approvedpremisesapi.transformer.cas1.Cas1SpaceSearchResultsTransformer
+import java.math.BigDecimal
 import java.time.LocalDate
 import java.util.UUID
-import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.Cas1SpaceSearchResult as ApiSpaceSearchResult
 
 class Cas1SpaceSearchResultsTransformerTest {
   private val transformer = Cas1SpaceSearchResultsTransformer()
@@ -32,77 +31,82 @@ class Cas1SpaceSearchResultsTransformerTest {
       ),
     )
 
-    val candidatePremises1 = CandidatePremises(
-      UUID.randomUUID(),
-      1.0f,
-      ApprovedPremisesType.NORMAL,
-      "Some AP",
-      "1 The Street",
-      null,
-      "Townsbury",
-      "TB1 2AB",
-      UUID.randomUUID(),
-      "Some AP Area",
-      characteristics = emptyList(),
-    )
-
-    val candidatePremises2 = CandidatePremises(
-      UUID.randomUUID(),
-      2.0f,
-      ApprovedPremisesType.NORMAL,
-      "Some Other AP",
-      "2 The Street",
-      null,
-      "Townsbury",
-      "TB1 2AB",
-      UUID.randomUUID(),
-      "Some AP Area",
-      characteristics = emptyList(),
-    )
+    val candidatePremise1Id = UUID.randomUUID()
+    val apAreaId1 = UUID.randomUUID()
 
-    val candidatePremises3 = CandidatePremises(
-      UUID.randomUUID(),
-      3.0f,
-      ApprovedPremisesType.NORMAL,
-      "Some AP",
-      "3 The Street",
-      null,
-      "Townsbury",
-      "TB1 2AB",
-      UUID.randomUUID(),
-      "Some AP Area",
-      characteristics = emptyList(),
-    )
+    val candidatePremise2Id = UUID.randomUUID()
+    val apAreaId2 = UUID.randomUUID()
 
     val searchResults = listOf(
-      candidatePremises1,
-      candidatePremises2,
-      candidatePremises3,
+      CandidatePremises(
+        premisesId = candidatePremise1Id,
+        distanceInMiles = 1.0f,
+        apType = ApprovedPremisesType.NORMAL,
+        fullAddress = null,
+        name = "Some AP 1",
+        addressLine1 = "1 The Street",
+        addressLine2 = null,
+        town = "Townsbury",
+        postcode = "TB1 2AB",
+        apAreaId = apAreaId1,
+        apAreaName = "Some AP Area 1",
+        characteristics = emptyList(),
+      ),
+      CandidatePremises(
+        premisesId = candidatePremise2Id,
+        distanceInMiles = 2.0f,
+        apType = ApprovedPremisesType.ESAP,
+        fullAddress = "The full address, not quite the same, somewhere",
+        name = "Some Other AP",
+        addressLine1 = "2 The Street",
+        addressLine2 = "Additional Bit",
+        town = "Townton",
+        postcode = "TB1 2AC",
+        apAreaId = apAreaId2,
+        apAreaName = "Some AP Area 2",
+        characteristics = emptyList(),
+      ),
     )
 
     val actual = transformer.transformDomainToApi(searchParameters, searchResults)
     assertThat(actual.searchCriteria).isNotNull
     assertThat(actual.searchCriteria).isEqualTo(searchParameters)
-    assertThat(actual.resultsCount).isEqualTo(3)
-    assertThatTransformedResultMatches(actual.results[0], candidatePremises1)
-    assertThatTransformedResultMatches(actual.results[1], candidatePremises2)
-    assertThatTransformedResultMatches(actual.results[2], candidatePremises3)
-  }
+    assertThat(actual.resultsCount).isEqualTo(2)
+
+    val premises1 = actual.results[0].premises
+    assertThat(premises1).isNotNull
+    premises1!!
+    assertThat(premises1.id).isEqualTo(candidatePremise1Id)
+    assertThat(premises1.apType).isEqualTo(ApType.normal)
+    assertThat(premises1.name).isEqualTo("Some AP 1")
+    assertThat(premises1.fullAddress).isEqualTo("1 The Street, Townsbury")
+    assertThat(premises1.addressLine1).isEqualTo("1 The Street")
+    assertThat(premises1.addressLine2).isNull()
+    assertThat(premises1.town).isEqualTo("Townsbury")
+    assertThat(premises1.postcode).isEqualTo("TB1 2AB")
+    assertThat(premises1.apArea.id).isEqualTo(apAreaId1)
+    assertThat(premises1.apArea.name).isEqualTo("Some AP Area 1")
+    assertThat(premises1.premisesCharacteristics).isEmpty()
+    assertThat(premises1.characteristics).isEmpty()
+    assertThat(actual.results[0].distanceInMiles).isEqualTo(BigDecimal.valueOf(1.0))
+    assertThat(actual.results[0].spacesAvailable).isEmpty()
 
-  private fun assertThatTransformedResultMatches(actual: ApiSpaceSearchResult, expected: CandidatePremises) {
-    assertThat(actual.premises).isNotNull
-    assertThat(actual.premises!!.id).isEqualTo(expected.premisesId)
-    assertThat(actual.premises!!.apType).isEqualTo(expected.apType.asApiType())
-    assertThat(actual.premises!!.name).isEqualTo(expected.name)
-    assertThat(actual.premises!!.addressLine1).isEqualTo(expected.addressLine1)
-    assertThat(actual.premises!!.addressLine2).isEqualTo(expected.addressLine2)
-    assertThat(actual.premises!!.town).isEqualTo(expected.town)
-    assertThat(actual.premises!!.postcode).isEqualTo(expected.postcode)
-    assertThat(actual.premises!!.apArea).isNotNull
-    assertThat(actual.premises!!.apArea!!.id).isEqualTo(expected.apAreaId)
-    assertThat(actual.premises!!.apArea!!.name).isEqualTo(expected.apAreaName)
-    assertThat(actual.premises!!.premisesCharacteristics).isEmpty()
-    assertThat(actual.distanceInMiles).isEqualTo(expected.distanceInMiles.toBigDecimal())
-    assertThat(actual.spacesAvailable).isEmpty()
+    val premises2 = actual.results[1].premises
+    assertThat(premises2).isNotNull
+    premises2!!
+    assertThat(premises2.id).isEqualTo(candidatePremise2Id)
+    assertThat(premises2.apType).isEqualTo(ApType.esap)
+    assertThat(premises2.name).isEqualTo("Some Other AP")
+    assertThat(premises2.fullAddress).isEqualTo("The full address, not quite the same, somewhere")
+    assertThat(premises2.addressLine1).isEqualTo("2 The Street")
+    assertThat(premises2.addressLine2).isEqualTo("Additional Bit")
+    assertThat(premises2.town).isEqualTo("Townton")
+    assertThat(premises2.postcode).isEqualTo("TB1 2AC")
+    assertThat(premises2.apArea.id).isEqualTo(apAreaId2)
+    assertThat(premises2.apArea.name).isEqualTo("Some AP Area 2")
+    assertThat(premises2.premisesCharacteristics).isEmpty()
+    assertThat(premises2.characteristics).isEmpty()
+    assertThat(actual.results[1].distanceInMiles).isEqualTo(BigDecimal.valueOf(2.0))
+    assertThat(actual.results[1].spacesAvailable).isEmpty()
   }
 }