diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/ApiClient.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/ApiClient.cs
index 9e59bdf54..9b7807ca1 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/ApiClient.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/ApiClient.cs
@@ -38,7 +38,11 @@ public async Task<HttpResponseMessage> GetProjectByIdAsync(int id)
       HttpResponseMessage getProjectResponse = await AcademisationClient.GetAsync(string.Format(PathFor.GetProjectById, id));
       return getProjectResponse;
    }
-
+   public async Task<HttpResponseMessage> GetFormAMatProjectById(int id)
+   {
+      HttpResponseMessage getProjectResponse = await AcademisationClient.GetAsync(string.Format(PathFor.GetFormAMatProjectById, id));
+      return getProjectResponse;
+   }
    public async Task<HttpResponseMessage> UpdateProjectAsync(int id, UpdateAcademyConversionProject updateProject)
    {
       return await AcademisationClient.PatchAsync(string.Format(PathFor.UpdateProject, id), JsonContent.Create(updateProject));
@@ -93,8 +97,32 @@ public async Task<HttpResponseMessage> SetSchoolOverview(int id, SetSchoolOvervi
       var formattedString = string.Format(PathFor.SetSchoolOverview, id);
       return await AcademisationClient.PutAsync(formattedString, JsonContent.Create(payload));
    }
+   public async Task<HttpResponseMessage> SetAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      var payload = new
+      {
+         id = updatedAssignedUser.Id,
+         userId = updatedAssignedUser.UserId,
+         fullName = updatedAssignedUser.FullName,
+         emailAddress = updatedAssignedUser.EmailAddress
+      };
 
+      var formattedString = string.Format(PathFor.SetAssignedUser, id);
+      return await AcademisationClient.PutAsync(formattedString, JsonContent.Create(payload));
+   }
+   public async Task<HttpResponseMessage> SetFormAMatAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      var payload = new
+      {
+         id = updatedAssignedUser.Id,
+         userId = updatedAssignedUser.UserId,
+         fullName = updatedAssignedUser.FullName,
+         emailAddress = updatedAssignedUser.EmailAddress
+      };
 
+      var formattedString = string.Format(PathFor.SetFormAMatAssignedUser, id);
+      return await AcademisationClient.PutAsync(formattedString, JsonContent.Create(payload));
+   }
    public async Task<HttpResponseMessage> GetAllProjectsV2Async(AcademyConversionSearchModelV2 searchModel)
    {
       return await AcademisationClient.PostAsync(PathFor.GetAllProjectsV2, JsonContent.Create(searchModel));
@@ -105,9 +133,9 @@ public async Task<HttpResponseMessage> SetPerformanceData(int id, SetPerformance
       return await AcademisationClient.PutAsync(string.Format(PathFor.SetPerformanceData, id), JsonContent.Create(setPerformanceDataModel));
    }
 
-   public async Task<HttpResponseMessage> GetMATProjectsAsync(AcademyConversionSearchModelV2 searchModel)
+   public async Task<HttpResponseMessage> GetFormAMatProjectsAsync(AcademyConversionSearchModelV2 searchModel)
    {
-      return await AcademisationClient.PostAsync(PathFor.GetMATProjects, JsonContent.Create(searchModel));
+      return await AcademisationClient.PostAsync(PathFor.GetFormAMatProjects, JsonContent.Create(searchModel));
    }
 
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/IApiClient.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/IApiClient.cs
index affaedec8..a89506096 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/IApiClient.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/IApiClient.cs
@@ -10,6 +10,7 @@ public interface IApiClient
    Task<HttpResponseMessage> DownloadProjectExport(AcademyConversionSearchModelV2 searchModel);
    Task<HttpResponseMessage> GetAllProjectsV2Async(AcademyConversionSearchModelV2 searchModel);
    Task<HttpResponseMessage> GetProjectByIdAsync(int id);
+   Task<HttpResponseMessage> GetFormAMatProjectById(int id);
    Task<HttpResponseMessage> UpdateProjectAsync(int id, UpdateAcademyConversionProject updateProject);
    Task<HttpResponseMessage> GetFilterParametersAsync();
    Task<HttpResponseMessage> GetApplicationByReferenceAsync(string id);
@@ -17,6 +18,8 @@ public interface IApiClient
 
    Task<HttpResponseMessage> SetProjectExternalApplicationForm(int id, bool externalApplicationFormSaved, string externalApplicationFormUrl);
    Task<HttpResponseMessage> SetSchoolOverview(int id, SetSchoolOverviewModel updatedSchoolOverview);
+   Task<HttpResponseMessage> SetAssignedUser(int id, SetAssignedUserModel updatedAssignedUser);
+   Task<HttpResponseMessage> SetFormAMatAssignedUser(int id, SetAssignedUserModel updatedAssignedUser);
    Task<HttpResponseMessage> SetPerformanceData(int id, SetPerformanceDataModel setPerformanceDataModel);
-   Task<HttpResponseMessage> GetMATProjectsAsync(AcademyConversionSearchModelV2 searchModel);
+   Task<HttpResponseMessage> GetFormAMatProjectsAsync(AcademyConversionSearchModelV2 searchModel);
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/PathFor.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/PathFor.cs
index 58ee22948..b8ae57ac0 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/PathFor.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Features/PathFor.cs
@@ -14,13 +14,16 @@ public PathFor(IFeatureManager features)
    public static string GetAllProjects => "/legacy/projects";
    public static string DownloadProjectExport => "/export/export-projects";
    public static string GetProjectById => "/legacy/project/{0}";
+   public static string GetFormAMatProjectById => "/conversion-project/formamatproject/{0}";
    public static string UpdateProject => "/legacy/project/{0}";
    public static string GetFilterParameters => "/legacy/projects/status";
    public static string AddProjectNote => "/legacy/project/{0}/notes";
    public static string SetExternalApplicationForm => "/conversion-project/{0}/setExternalApplicationForm";
    public static string SetPerformanceData => "/conversion-project/{0}/SetPerformanceData";
    public static string SetSchoolOverview => "/conversion-project/{0}/SetSchoolOverview";
+   public static string SetAssignedUser => "/conversion-project/{0}/SetAssignedUser";
+   public static string SetFormAMatAssignedUser => "/conversion-project/{0}/SetFormAMatAssignedUser";
 
    public static string GetAllProjectsV2 => "/conversion-project/projects";
-   public static string GetMATProjects => "/conversion-project/MATprojects";
+   public static string GetFormAMatProjects => "/conversion-project/FormAMatProjects";
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
index c70f2a492..158e2712d 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
@@ -7,6 +7,7 @@ public class AcademyConversionProject
 {
    public int Id { get; set; }
    public int? Urn { get; set; }
+   public int? FormAMatProjectId {  get; set; }
    public DateTime CreatedOn { get; set; }
    public string SchoolName { get; set; }
    public string SchoolPhase { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/FormAMATProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/FormAMATProject.cs
index d0185eb92..a25408654 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/FormAMATProject.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/FormAMATProject.cs
@@ -1,137 +1,14 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Dfe.PrepareConversions.Data.Models;
 
-public class FormAMATProject
+public class FormAMatProject
 {
    public int Id { get; set; }
-   public int? Urn { get; set; }
-   public DateTime CreatedOn { get; set; }
-   public string SchoolName { get; set; }
-   public string SchoolPhase { get; set; }
-   public string SchoolType { get; set; }
-   public string LocalAuthority { get; set; }
-   public string ApplicationReferenceNumber { get; set; }
-   public string ProjectStatus { get; set; }
-   public DateTime? ApplicationReceivedDate { get; set; }
-   public DateTime? AssignedDate { get; set; }
-   public DateTime? HeadTeacherBoardDate { get; set; }
-   public DateTime? BaselineDate { get; set; }
 
-   //la summary page
-   public DateTime? LocalAuthorityInformationTemplateSentDate { get; set; }
-   public DateTime? LocalAuthorityInformationTemplateReturnedDate { get; set; }
-   public string LocalAuthorityInformationTemplateComments { get; set; }
-   public string LocalAuthorityInformationTemplateLink { get; set; }
-   public bool? LocalAuthorityInformationTemplateSectionComplete { get; set; }
-
-   //school/trust info
-   public string RecommendationForProject { get; set; }
-   public string Author { get; set; }
-   public string Version { get; set; }
-   public string ClearedBy { get; set; }
-   public string AcademyOrderRequired { get; set; }
-   public string PreviousHeadTeacherBoardDateQuestion { get; set; }
-   public DateTime? PreviousHeadTeacherBoardDate { get; set; }
-   public string PreviousHeadTeacherBoardLink { get; set; }
-   public string TrustReferenceNumber { get; set; }
-   public string NameOfTrust { get; set; }
-   public string SponsorReferenceNumber { get; set; }
-   public string SponsorName { get; set; }
-   public string AcademyTypeAndRoute { get; set; }
-   public string Form7Received { get; set; }
-   public DateTime? Form7ReceivedDate { get; set; }
-   public DateTime? ProposedAcademyOpeningDate { get; set; }
-   public bool? SchoolAndTrustInformationSectionComplete { get; set; }
-   public decimal? ConversionSupportGrantAmount { get; set; }
-   public string ConversionSupportGrantChangeReason { get; set; }
-   public string ConversionSupportGrantType { get; set; }
-   public string ConversionSupportGrantEnvironmentalImprovementGrant { get; set; }
-   public bool? ConversionSupportGrantAmountChanged { get; set; }
-   public string ConversionSupportGrantNumberOfSites { get; set; }
-   public DateTime? DaoPackSentDate { get; set; }
-   public string Region { get; set; }
-
-   // Annex B
-   public bool? AnnexBFormReceived { get; set; }
-   public string AnnexBFormUrl { get; set; }
-
-   // External Application Form
-   public bool? ExternalApplicationFormSaved { get; set; }
-   public string? ExternalApplicationFormUrl { get; set; }
-
-   // School Overview
-   public string PublishedAdmissionNumber { get; set; }
-   public string PartOfPfiScheme { get; set; }
-   public string PfiSchemeDetails { get; set; }
-   public string ViabilityIssues { get; set; }
-   public decimal? NumberOfPlacesFundedFor { get; set; }
-   public decimal? NumberOfResidentialPlaces { get; set; }
-   public decimal? NumberOfFundedResidentialPlaces { get; set; }
-   public string FinancialDeficit { get; set; }
-   public decimal? DistanceFromSchoolToTrustHeadquarters { get; set; }
-   public string DistanceFromSchoolToTrustHeadquartersAdditionalInformation { get; set; }
-   public string MemberOfParliamentNameAndParty { get; set; }
-   public bool? SchoolOverviewSectionComplete { get; set; }
-   public bool? PupilsAttendingGroupPermanentlyExcluded { get; set; }
-   public bool? PupilsAttendingGroupMedicalAndHealthNeeds { get; set; }
-   public bool? PupilsAttendingGroupTeenageMums { get; set; }
-   public int? NumberOfAlternativeProvisionPlaces { get; set; }
-   public int? NumberOfMedicalPlaces { get; set; }
-   public int? NumberOfPost16Places { get; set; }
-   public int? NumberOfSENUnitPlaces { get; set; }
-
-   //school performance ofsted information
-   public string SchoolPerformanceAdditionalInformation { get; set; }
-
-   // rationale
-   public string RationaleForProject { get; set; }
-   public string RationaleForTrust { get; set; }
-   public bool? RationaleSectionComplete { get; set; }
-
-   // risk and issues
-   public string RisksAndIssues { get; set; }
-   public bool? RisksAndIssuesSectionComplete { get; set; }
-
-   // legal requirements
-   public string GoverningBodyResolution { get; set; }
-   public string Consultation { get; set; }
-   public string DiocesanConsent { get; set; }
-   public string FoundationConsent { get; set; }
-   public bool? LegalRequirementsSectionComplete { get; set; }
-
-   // school budget info
-   public DateTime? EndOfCurrentFinancialYear { get; set; }
-   public decimal? RevenueCarryForwardAtEndMarchCurrentYear { get; set; }
-   public decimal? CapitalCarryForwardAtEndMarchCurrentYear { get; set; }
-   public DateTime? EndOfNextFinancialYear { get; set; }
-   public decimal? ProjectedRevenueBalanceAtEndMarchNextYear { get; set; }
-   public decimal? CapitalCarryForwardAtEndMarchNextYear { get; set; }
-   public string SchoolBudgetInformationAdditionalInformation { get; set; }
-   public bool? SchoolBudgetInformationSectionComplete { get; set; }
-
-   // pupil schools forecast
-   public int? YearOneProjectedCapacity { get; set; }
-   public int? YearOneProjectedPupilNumbers { get; set; }
-   public int? YearTwoProjectedCapacity { get; set; }
-   public int? YearTwoProjectedPupilNumbers { get; set; }
-   public int? YearThreeProjectedCapacity { get; set; }
-   public int? YearThreeProjectedPupilNumbers { get; set; }
-   public int? YearFourProjectedCapacity { get; set; }
-   public int? YearFourProjectedPupilNumbers { get; set; }
-   public string SchoolPupilForecastsAdditionalInformation { get; set; }
-
-   // key stage performance tables
-   public string KeyStage2PerformanceAdditionalInformation { get; set; }
-   public string KeyStage4PerformanceAdditionalInformation { get; set; }
-   public string KeyStage5PerformanceAdditionalInformation { get; set; }
-   public string EducationalAttendanceAdditionalInformation { get; set; }
-
-   // assigned user
+   public string ProposedTrustName { get; set; }
+   public string ApplicationReference { get; set; }
    public User AssignedUser { get; set; }
-
-   // notes
-   public ICollection<ProjectNote> Notes { get; set; } = new List<ProjectNote>();
+   public ICollection<AcademyConversionProject> Projects { get; set; } = new List<AcademyConversionProject>();
 
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/SetAssignedUserModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/SetAssignedUserModel.cs
new file mode 100644
index 000000000..80599ec0f
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/SetAssignedUserModel.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Dfe.PrepareConversions.Data.Models
+{
+   public class SetAssignedUserModel
+   {
+      public SetAssignedUserModel() { }
+      public SetAssignedUserModel(
+         int id,
+         Guid userId,
+         string fullName,
+         string emailAddress)
+      {
+         Id = id;
+         UserId = userId;
+         FullName = fullName;
+         EmailAddress = emailAddress;
+      }
+
+      public int Id { get; set; }
+      public Guid UserId { get; set; }
+      public string FullName { get; set; }
+
+      public string EmailAddress { get; set; }
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
index 964972fc7..44bce5331 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
@@ -66,7 +66,17 @@ public async Task<ApiResponse<AcademyConversionProject>> GetProjectById(int id)
       AcademyConversionProject project = await ReadFromJsonAndThrowIfNull<AcademyConversionProject>(response.Content);
       return new ApiResponse<AcademyConversionProject>(response.StatusCode, project);
    }
+   public async Task<ApiResponse<FormAMatProject>> GetFormAMatProjectById(int id)
+   {
+      HttpResponseMessage response = await _apiClient.GetFormAMatProjectById(id);
+      if (!response.IsSuccessStatusCode)
+      {
+         return new ApiResponse<FormAMatProject>(response.StatusCode, null);
+      }
 
+      FormAMatProject project = await ReadFromJsonAndThrowIfNull<FormAMatProject>(response.Content);
+      return new ApiResponse<FormAMatProject>(response.StatusCode, project);
+   }
    public async Task<ApiResponse<AcademyConversionProject>> UpdateProject(int id, UpdateAcademyConversionProject updateProject)
    {
       ApiResponse<AcademyConversionProject> projectResponse = await GetProjectById(id);
@@ -250,6 +260,16 @@ public async Task SetSchoolOverview(int id, SetSchoolOverviewModel updatedSchool
       HttpResponseMessage result = await _apiClient.SetSchoolOverview(id, updatedSchoolOverview);
       if (result.IsSuccessStatusCode is false) throw new ApiResponseException($"Request to Api failed | StatusCode - {result.StatusCode}");
    }
+   public async Task SetAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      HttpResponseMessage result = await _apiClient.SetAssignedUser(id, updatedAssignedUser);
+      if (result.IsSuccessStatusCode is false) throw new ApiResponseException($"Request to Api failed | StatusCode - {result.StatusCode}");
+   }
+   public async Task SetFormAMatAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      HttpResponseMessage result = await _apiClient.SetFormAMatAssignedUser(id, updatedAssignedUser);
+      if (result.IsSuccessStatusCode is false) throw new ApiResponseException($"Request to Api failed | StatusCode - {result.StatusCode}");
+   }
 
    public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>>>> GetAllProjectsV2(int page, int count, string titleFilter = "", IEnumerable<string> statusFilters = null, IEnumerable<string> deliveryOfficerFilter = null, IEnumerable<string> regionsFilter = null, IEnumerable<string> localAuthoritiesFilter = null, IEnumerable<string> advisoryBoardDatesFilter = null)
    {
@@ -269,22 +289,22 @@ public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>
       return new ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>>>(response.StatusCode, outerResponse);
    }
 
-   public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>> GetMATProjects(int page, int count, string titleFilter = "", IEnumerable<string> statusFilters = null, IEnumerable<string> deliveryOfficerFilter = null, IEnumerable<string> regionsFilter = null, IEnumerable<string> localAuthoritiesFilter = null, IEnumerable<string> advisoryBoardDatesFilter = null)
+   public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>>> GetFormAMatProjects(int page, int count, string titleFilter = "", IEnumerable<string> statusFilters = null, IEnumerable<string> deliveryOfficerFilter = null, IEnumerable<string> regionsFilter = null, IEnumerable<string> localAuthoritiesFilter = null, IEnumerable<string> advisoryBoardDatesFilter = null)
    {
       AcademyConversionSearchModelV2 searchModel = new() { TitleFilter = titleFilter, Page = page, Count = count };
 
       ProcessFiltersV2(statusFilters, deliveryOfficerFilter, searchModel, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
 
-      HttpResponseMessage response = await _apiClient.GetMATProjectsAsync(searchModel);
+      HttpResponseMessage response = await _apiClient.GetFormAMatProjectsAsync(searchModel);
       if (!response.IsSuccessStatusCode)
       {
-         return new ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>(response.StatusCode,
-            new ApiV2Wrapper<IEnumerable<FormAMATProject>> { Data = Enumerable.Empty<FormAMATProject>() });
+         return new ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>>(response.StatusCode,
+            new ApiV2Wrapper<IEnumerable<FormAMatProject>> { Data = Enumerable.Empty<FormAMatProject>() });
       }
 
-      ApiV2Wrapper<IEnumerable<FormAMATProject>> outerResponse = await response.Content.ReadFromJsonAsync<ApiV2Wrapper<IEnumerable<FormAMATProject>>>();
+      ApiV2Wrapper<IEnumerable<FormAMatProject>> outerResponse = await response.Content.ReadFromJsonAsync<ApiV2Wrapper<IEnumerable<FormAMatProject>>>();
 
-      return new ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>(response.StatusCode, outerResponse);
+      return new ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>>(response.StatusCode, outerResponse);
    }
 
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/ApiV2PagingInfo.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/ApiV2PagingInfo.cs
index 70b92d9fc..fc9ff31d9 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/ApiV2PagingInfo.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/ApiV2PagingInfo.cs
@@ -4,5 +4,5 @@ public class ApiV2PagingInfo
 {
    public int Page { get; set; }
    public int RecordCount { get; set; }
-   public string NextPageUrl { get; set; }
+   public string? NextPageUrl { get; set; }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
index 1fbbba194..9a89dac10 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
@@ -39,7 +39,7 @@ Task<ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>>>> GetAllPro
    IEnumerable<string> advisoryBoardDatesFilter = default
 );
 
-   Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>> GetMATProjects(
+   Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>>> GetFormAMatProjects(
       int page,
       int count,
       string titleFilter = "",
@@ -51,9 +51,12 @@ Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>> GetMATProjects(
    );
 
    Task<ApiResponse<AcademyConversionProject>> GetProjectById(int id);
+   Task<ApiResponse<FormAMatProject>> GetFormAMatProjectById(int id);
    Task<ApiResponse<AcademyConversionProject>> UpdateProject(int id, UpdateAcademyConversionProject updateProject);
    Task CreateProject(CreateNewProject newProject);
    Task SetProjectExternalApplicationForm(int id, bool externalApplicationFormSaved, string externalApplicationFormUrl);
+   Task SetAssignedUser(int id, SetAssignedUserModel updatedAssignedUser);
+   Task SetFormAMatAssignedUser(int id, SetAssignedUserModel updatedAssignedUser);
    Task SetSchoolOverview(int id, SetSchoolOverviewModel updatedSchoolOverview);
    Task SetPerformanceData(int id, SetPerformanceDataModel setPerformanceDataModel);
    Task<ApiResponse<ProjectFilterParameters>> GetFilterParameters();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/IntegrationTestingWebApplicationFactory.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/IntegrationTestingWebApplicationFactory.cs
index 470e4f96e..421bf8fc3 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/IntegrationTestingWebApplicationFactory.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/IntegrationTestingWebApplicationFactory.cs
@@ -47,6 +47,8 @@ public IntegrationTestingWebApplicationFactory()
 
    public ITestOutputHelper DebugOutput { get; set; }
 
+   public IUserRepository UserRepository { get; private set; }
+
    public IEnumerable<LogEntry> GetMockServerLogs(string path, HttpMethod verb = null)
    {
       IRequestBuilder requestBuilder = Request.Create().WithPath(path);
@@ -83,11 +85,13 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
       featureManager.Setup(m => m.IsEnabledAsync("UseAcademisationApplication")).ReturnsAsync(true);
       featureManager.Setup(m => m.IsEnabledAsync("ShowDirectedAcademyOrders")).ReturnsAsync(true);
 
+      UserRepository = new TestUserRepository();
+
       builder.ConfigureServices(services =>
       {
          services.AddAuthentication("Test");
          services.AddTransient<IAuthenticationSchemeProvider, MockSchemeProvider>();
-         services.AddTransient<IUserRepository, TestUserRepository>();
+         services.AddScoped(x => UserRepository);
          services.AddTransient(_ => featureManager.Object);
       });
    }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/BaseIntegrationTests.MockData.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/BaseIntegrationTests.MockData.cs
index bd434f0bd..6f515bd7c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/BaseIntegrationTests.MockData.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/BaseIntegrationTests.MockData.cs
@@ -163,6 +163,39 @@ public SetPerformanceDataModel AddPutPerformanceData(AcademyConversionProject pr
       _factory.AddPutWithJsonRequest(string.Format(PathFor.SetPerformanceData, project.Id), request, project);
       return request;
    }
+   public SetAssignedUserModel AddSetAssignUser(AcademyConversionProject project, string fullName)
+   {
+      var deliveryOfficers = _factory.UserRepository.GetAllUsers().Result;
+      var assignedUser = deliveryOfficers.SingleOrDefault(u => u.FullName == fullName);
+      SetAssignedUserModel request;
+
+      if (assignedUser == null)
+      {
+         request = _fixture
+           .Build<SetAssignedUserModel>()
+           .OmitAutoProperties()
+           .With(x => x.Id, project.Id)
+           .With(x => x.UserId, Guid.Empty)
+           .With(x => x.FullName, string.Empty)
+           .With(x => x.EmailAddress, string.Empty)
+           .Create();
+      }
+      else
+      {
+         request = _fixture
+           .Build<SetAssignedUserModel>()
+           .OmitAutoProperties()
+           .With(x => x.Id, project.Id)
+           .With(x => x.UserId, Guid.Parse(assignedUser.Id))
+           .With(x => x.FullName, fullName)
+           .With(x => x.EmailAddress, assignedUser.EmailAddress)
+           .Create();
+      }
+
+      _factory.AddPutWithJsonRequest(string.Format(PathFor.SetAssignedUser, project.Id), request, project);
+      return request;
+   }
+
 
    public UpdateAcademyConversionProject AddPatchProjectMany(AcademyConversionProject project,
                                                              Func<IPostprocessComposer<UpdateAcademyConversionProject>, IPostprocessComposer<UpdateAcademyConversionProject>>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/ProjectAssignmentIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/ProjectAssignmentIntegrationTests.cs
index 1330deec8..c27f393c8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/ProjectAssignmentIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/ProjectAssignmentIntegrationTests.cs
@@ -31,12 +31,14 @@ public async Task Should_redirect_to_assign_project_page()
    [Fact]
    public async Task Should_assign_a_project()
    {
-      AcademyConversionProject project = AddGetProject();
+      AcademyConversionProject project = AddGetProject();     
       await OpenAndConfirmPathAsync($"/project-assignment/{project.Id}");
       string fullName = "Bob 1";
+      AddSetAssignUser(project, fullName);
+
       Document.QuerySelector<IHtmlInputElement>("[id='delivery-officer-input']")!.Value = fullName;
       Document.QuerySelector<IHtmlOptionElement>($"[value='{fullName}']")!.IsSelected = true;
-      await Document.QuerySelector<IHtmlFormElement>("form")!.SubmitAsync();
+      await Document.QuerySelector<IHtmlFormElement>("form")!.SubmitAsync();    
 
       Document.QuerySelector<IHtmlElement>("#notification-message")!.TextContent.Trim().Should()
          .Be("Project is assigned");
@@ -69,7 +71,7 @@ public async Task Should_unassign_a_project()
    {
       AcademyConversionProject project = AddGetProject();
       await OpenAndConfirmPathAsync($"/project-assignment/{project.Id}");
-
+      AddSetAssignUser(project, string.Empty);
       Document.QuerySelector<IHtmlInputElement>("#UnassignDeliveryOfficer")!.Value = "true";
       await Document.QuerySelector<IHtmlFormElement>("form")!.SubmitAsync();
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/TestUserRepository.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/TestUserRepository.cs
index 47369c784..ff0f8d193 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/TestUserRepository.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectAssignment/TestUserRepository.cs
@@ -1,5 +1,6 @@
 using Dfe.PrepareConversions.Data.Models;
 using Dfe.PrepareConversions.Data.Services.Interfaces;
+using DocumentFormat.OpenXml.Spreadsheet;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,12 +10,15 @@ namespace Dfe.PrepareConversions.Tests.Pages.ProjectAssignment;
 
 public class TestUserRepository : IUserRepository
 {
+   private List<User> users = new();
+   
    public Task<IEnumerable<User>> GetAllUsers()
    {
-      List<User> toReturn = new();
-      for (int i = 0; i < 30; i++)
-         toReturn.Add(new User(Guid.NewGuid().ToString(), $"bob.{i}@education.gov.uk", $"Bob {i}"));
-
-      return Task.FromResult(toReturn.AsEnumerable());
+      if (users.Count == 0)
+      {
+         for (int i = 0; i < 30; i++)
+            users.Add(new User(Guid.NewGuid().ToString(), $"bob.{i}@education.gov.uk", $"Bob {i}"));
+      }
+      return Task.FromResult(users.AsEnumerable());
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectList/ProjectListIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectList/ProjectListIntegrationTests.cs
index e68fec4b4..351952bbe 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectList/ProjectListIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/ProjectList/ProjectListIntegrationTests.cs
@@ -28,7 +28,7 @@ public async Task Should_display_list_of_projects_and_navigate_to_and_from_task_
       AcademyConversionProject firstProject = AddGetProject(p => p.Id = projects.First().Id);
 
       await NavigateAsync(projects.First().SchoolName);
-      Document.Url.Should().BeUrl($"/task-list/{firstProject.Id}");
+      Document.Url.Should().BeUrl($"/task-list/{firstProject.Id}?returnToFormAMatMenu=False");
 
       await NavigateAsync("Back");
       Document.Url.Should().BeUrl("/project-list");
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Extensions/ProjectListRowViewModelHelpers.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Extensions/ProjectListRowViewModelHelpers.cs
index 47fd47967..acb65aad6 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Extensions/ProjectListRowViewModelHelpers.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Extensions/ProjectListRowViewModelHelpers.cs
@@ -8,4 +8,9 @@ public static ProjectListRowViewModel Row(this ProjectListViewModel project, int
    {
       return new ProjectListRowViewModel { Item = project, Index = index };
    }
+
+   public static FormAMatProjectListRowViewModel Row(this FormAMatProjectListViewModel project, int index)
+   {
+      return new FormAMatProjectListRowViewModel { Item = project, Index = index };
+   }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
index 9270d80e1..831ecdb6a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
@@ -49,6 +49,7 @@ public static class ProjectType
    public static class ProjectAssignment
    {
       public static readonly LinkItem Index = AddLinkItem(backText: "Back", page: "/ProjectAssignment/Index");
+      public static readonly LinkItem FormAMatProjectAssignment = AddLinkItem(backText: "Back", page: "/ProjectAssignment/FormAMatProjectAssignment");
    }
 
    public static class ProjectList
@@ -73,7 +74,9 @@ public static class TaskList
    public static class FormAMat
    {
       public static readonly LinkItem Index = AddLinkItem(backText: "Back", page: "/FormAMat/Index");
-      public static readonly LinkItem OtherSchoolsInMat = AddLinkItem(backText: "Back to project listing", page: "/FormAMat/OtherSchoolsInMat");
+      // not sure these are right probably need to look at this, they look the wrong way round
+      public static readonly LinkItem OtherSchoolsInMat = AddLinkItem(backText: "Back to project listing", page: "/FormAMat/FormAMatParentIndex");
+      public static readonly LinkItem FormAMatProjectPage = AddLinkItem(backText: "Back to project listing", page: "/schools-in-this-mat");
    }
 
    public static class SchoolPerformance
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml
new file mode 100644
index 000000000..e70af2f6d
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml
@@ -0,0 +1,140 @@
+@page "/schools-in-this-mat/{id:int}"
+@using Dfe.Academisation.ExtensionMethods
+@model Dfe.PrepareConversions.Pages.FormAMat.FormAMatParentIndex
+@{
+   ViewData["Title"] = "Schools in this MAT";
+}
+
+@section BeforeMain
+{
+    <a asp-page="@Links.ProjectList.FormAMat.Page" class="govuk-back-link">@Links.ProjectList.FormAMat.BackText</a>
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+        <span class="govuk-caption-xl">Application ref: @Model.Project.ApplciationReference</span>
+        <h1 class="govuk-heading-xl govuk-!-margin-bottom-2" data-cy="select-heading">
+            @Model.Project.TrustName
+        </h1>
+        <p class="govuk-body govuk-!-margin-bottom-5">
+            Assigned to:
+
+            @if (Model.Project.AssignedUserFullName == null || string.IsNullOrWhiteSpace(Model?.Project?.AssignedUserFullName))
+            {
+                <span data-id="assigned-user" class="empty">Empty</span>
+            }
+            else
+            {
+                <strong data-id="assigned-user">@Model.Project.AssignedUserFullName</strong>
+            }
+
+            <a class="govuk-link govuk-!-padding-left-50" asp-page="@Links.ProjectAssignment.FormAMatProjectAssignment.Page" asp-route-id="@Model.Project.Id">Change</a>
+        </p>
+        <p class="govuk-!-margin-top-0  govuk-!-margin-bottom-8">
+            @{
+                var statusSummary = Model.Statuses
+                .GroupBy(status => new { status.Value, status.Colour })
+                .Select(group => new { Status = group.Key.Value, Colour = group.Key.Colour, Count = group.Count() })
+                .ToList();
+
+                foreach (var status in statusSummary)
+                {
+                    <strong class="govuk-tag govuk-tag--@status.Colour" id="summary-status-@Model.Project.Id">@status.Count @status.Status</strong>
+                }
+            }
+
+        </p>
+    </div>
+    <div class="govuk-grid-column-full">
+        <nav class="moj-sub-navigation" aria-label="Sub navigation">
+            <ul class="moj-sub-navigation__list govuk-!-margin-top-6">
+                <li class="moj-sub-navigation__item">
+                    <sub-menu-link class="moj-sub-navigation__link"
+                                   asp-page="@Links.FormAMat.OtherSchoolsInMat.Page"
+                                   asp-route-id="@Model.Project.Id">
+                        Schools in this Trust
+                    </sub-menu-link>
+                </li>              
+            </ul>
+        </nav>
+    </div>
+</div>
+
+<div class="govuk-grid-row">
+   <div class="govuk-grid-column-full">
+      <table class="govuk-table" aria-describedby="Table of projects within the same Form a Mat application">
+            <thead class="govuk-table__head govuk-!-display-none">
+                <tr class="govuk-table__row">
+                    <th class="govuk-table__header app-!-width-three-fifths">Application information</th>
+                </tr>
+            </thead>
+         <tbody class="govuk-table__body">
+                @{
+                    var index = 0;
+
+                    foreach (var project in Model.Projects)
+                    {
+                        var projectRow = project.Row(index);
+
+                        var isFormAMat = project.IsFormAMat;
+                        var matTypeClass = isFormAMat ? "form-a-mat" : "join-a-mat";
+                        var link = @Links.TaskList.Index.Page;
+
+                        <tr class="govuk-table__row @matTypeClass" data-cy="select-projectlist-filter-row">
+                            <td class="govuk-table__cell">
+                                <div class="govuk-!-margin-top-1 govuk-!-margin-bottom-2">
+                                    <strong>
+                                        <a id="@("school-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id" asp-route-returnToFormAMatMenu="True">@projectRow.Item.SchoolName</a>
+                                    </strong>
+                                </div>
+                                <div class="govuk-!-margin-top-1">
+                                    <span id="@("urn-" + projectRow.Index)"><strong>URN:</strong> @projectRow.Item.SchoolURN</span>
+                                </div>
+                                @if (!@projectRow.Item.LocalAuthority.IsEmpty())
+                                {
+                                    <div id="@("local-authority-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                                        <strong>Local authority:</strong>
+                                        @projectRow.Item.LocalAuthority
+                                    </div>
+                                }
+                                <div id="@("region-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                                    <strong>Region:</strong>
+                                    <span if="projectRow.Item.Region.IsEmpty()" class="empty">Empty</span>
+                                    <span if="projectRow.Item.Region.IsPresent()">@projectRow.Item.Region</span>
+                                </div>
+                                <div id="@("incoming-trust-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                                    <strong>Incoming trust:</strong>
+                                    <span if="projectRow.Item.NameOfTrust.IsEmpty()" class="empty">Empty</span>
+                                    <span if="projectRow.Item.NameOfTrust.IsPresent()">@projectRow.Item.NameOfTrust?.ToTitleCase()</span>
+                                </div>
+                                <div id="@("advisory-board-date-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                                    <strong>Advisory board date:</strong>
+                                    <span if="projectRow.Item.HeadTeacherBoardDate.IsEmpty()" class="empty">Unconfirmed</span>
+                                    <span if="projectRow.Item.HeadTeacherBoardDate.IsPresent()">@projectRow.Item.HeadTeacherBoardDate</span>
+                                </div>
+                                <div id="@("type-and-route-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                                    <strong>Route:</strong>
+                                    <span if="projectRow.Item.TypeAndRoute.IsEmpty()" class="empty">Unconfirmed</span>
+                                    <span if="projectRow.Item.TypeAndRoute.IsPresent()">@projectRow.Item.TypeAndRoute.RouteDescription()</span>
+                                </div>
+                                @if (!isFormAMat)
+                                {
+                                    <div id="@("assigned-to-" + projectRow.Index)" class="do govuk-!-margin-top-1">
+                                        <strong>Assigned to:</strong>
+                                        <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Unassigned</span>
+                                        <span if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</span>
+                                    </div>
+                                }
+                                <div class="govuk-!-margin-top-2 govuk-!-margin-bottom-3">
+                                    <strong class="govuk-tag govuk-tag--@projectRow.Item.Status.Colour" id="project-status-@projectRow.Item.Id">@projectRow.Item.Status.Value</strong>
+                                </div>
+                            </td>
+                        </tr>
+
+                        index++;
+                    }
+                }
+         </tbody>
+      </table>
+   </div>
+</div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml.cs
new file mode 100644
index 000000000..74386495c
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/FormAMatParentIndex.cshtml.cs
@@ -0,0 +1,62 @@
+using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models.ProjectList;
+using Dfe.PrepareConversions.Utils;
+using Dfe.PrepareConversions.ViewModels;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace Dfe.PrepareConversions.Pages.FormAMat;
+
+public class FormAMatParentIndex : PageModel
+{
+   private readonly IAcademyConversionProjectRepository _repository;
+   public FormAMatProjectViewModel Project { get; set; }
+
+   public FormAMatParentIndex(IAcademyConversionProjectRepository repository)
+   {
+      _repository = repository;
+   }
+
+   public List<ProjectListViewModel> Projects { get; set; }
+   public List<ProjectStatus> Statuses { get; set; }
+
+   [BindProperty]
+   public ProjectListFilters Filters { get; set; } = new();
+
+   public async Task<IActionResult> OnGetAsync(int id)
+   {
+      IActionResult result = await SetFormAMatProject(id);
+      Projects = Project.Projects.Select(AcademyConversionProject => ProjectListHelper.Build(AcademyConversionProject)).ToList();
+      Statuses = GetProjectStatuses();
+      if ((result as StatusCodeResult)?.StatusCode == (int)HttpStatusCode.NotFound)
+      {
+         return NotFound();
+      }
+
+      TempData["returnToFormAMatMenu"] = true;
+
+      return Page();
+   }
+   protected async Task<IActionResult> SetFormAMatProject(int id)
+   {
+      var FamProject = await _repository.GetFormAMatProjectById(id);
+
+      if (!FamProject.Success)
+      {
+         // 404 logic
+         return NotFound();
+      }
+
+      Project = new FormAMatProjectViewModel(FamProject.Body);
+      return Page();
+   }
+
+   public List<ProjectStatus> GetProjectStatuses()
+   {
+      return Projects.Select(x => x.Status).ToList();
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml
index 66ca0e540..c8f3707c4 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml
@@ -9,10 +9,10 @@
 
 @section BeforeMain
     {
-    <a asp-page="@Links.ProjectList.Index.Page" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+    <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
 }
 
-    <partial name="Shared/_FormAMatProjectHeader" model="Model.Project" />
+    <partial name="Shared/_ProjectHeader" model="Model.Project" />
 
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml.cs
index 68a71fa2c..92b1ae630 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/Index.cshtml.cs
@@ -12,6 +12,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using Dfe.PrepareConversions.Models;
 
 namespace Dfe.PrepareConversions.Pages.FormAMat;
 
@@ -19,6 +20,9 @@ public class FormAMatIndexModel : BaseAcademyConversionProjectPageModel
 {
    protected readonly ApplicationRepository _applicationRepository;
    public IEnumerable<BaseFormSection> Sections { get; set; }
+
+   public string ReturnPage { get; set; }
+   public string ReturnId { get; set; }
    public FormAMatIndexModel(IAcademyConversionProjectRepository repository, ApplicationRepository applicationRepository) : base(repository)
    {
       _applicationRepository = applicationRepository;
@@ -69,6 +73,16 @@ public override async Task<IActionResult> OnGetAsync(int id)
          new DeclarationSection(currentSchool)
       };
 
+      ReturnPage = @Links.ProjectList.Index.Page;
+      var returnToFormAMatMenu = TempData["returnToFormAMatMenu"] as bool?;
+
+      if (Project.IsFormAMat && returnToFormAMatMenu.HasValue && returnToFormAMatMenu.Value)
+      {
+         ReturnId = Project.FormAMatProjectId.ToString();
+         ReturnPage = @Links.FormAMat.OtherSchoolsInMat.Page;
+         TempData["returnToFormAMatMenu"] = true;
+      }
+
       return result;
    }
    public string GenerateId(string heading)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml
deleted file mode 100644
index 0129feb68..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml
+++ /dev/null
@@ -1,36 +0,0 @@
-@page "/schools-in-this-mat/{id:int}"
-@model Dfe.PrepareConversions.Pages.FormAMat.OtherSchoolsInMatModel
-@{
-   ViewData["Title"] = "Schools in this MAT";
-}
-
-@section BeforeMain
-{
-   <a asp-page="@Links.ProjectList.Index.Page" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
-}
-
-<partial name="Shared/_FormAMatProjectHeader" model="Model.Project"/>
-
-<div class="govuk-grid-row">
-   <div class="govuk-grid-column-full">
-      <h2 class="govuk-heading-l govuk-!-margin-bottom-2">Other schools in this MAT</h2>
-      <table class="govuk-table" aria-describedby="Table of projects within the same Form a Mat application">
-         <thead class="govuk-table__head">
-         <tr class="govuk-table__row">
-            <th class="govuk-table__header app-!-width-three-fifths">Application information</th>
-            <th class="govuk-table__header govuk-!-text-align-right app-!-width-two-fifths prepare-text-align-right">Project status and dates</th>
-         </tr>
-         </thead>
-         <tbody class="govuk-table__body">
-         @{
-            var index = 0;
-            foreach (ProjectListViewModel project in Model.Projects)
-            {
-               <partial if="project.IsFormAMat" name="Shared/FormAMatProjectListRow" model="project.Row(index)"/>
-               index++;
-            }
-         }
-         </tbody>
-      </table>
-   </div>
-</div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml.cs
deleted file mode 100644
index 1ac84bce1..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/OtherSchoolsInMat.cshtml.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Dfe.PrepareConversions.Data.Services;
-using Dfe.PrepareConversions.Models.ProjectList;
-using Dfe.PrepareConversions.Data.Models;
-using Dfe.PrepareConversions.Data;
-using Dfe.PrepareConversions.Utils;
-using Dfe.PrepareConversions.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace Dfe.PrepareConversions.Pages.FormAMat;
-
-public class OtherSchoolsInMatModel : PaginatedPageModel
-{
-   private readonly IAcademyConversionProjectRepository _repository;
-   public ProjectViewModel Project { get; set; }
-
-   public OtherSchoolsInMatModel(IAcademyConversionProjectRepository repository)
-   {
-      _repository = repository;
-   }
-
-   protected override ApiV2PagingInfo Paging { get; set; }
-
-   public IEnumerable<ProjectListViewModel> Projects { get; set; }
-
-   public int TotalProjects { get; set; }
-
-   [BindProperty]
-   public ProjectListFilters Filters { get; set; } = new();
-
-   public async Task<IActionResult> OnGetAsync(int id)
-   {
-      ProjectListFilters.ClearFiltersFrom(TempData);
-
-      IActionResult result = await SetProject(id);
-
-      if ((result as StatusCodeResult)?.StatusCode == (int)HttpStatusCode.NotFound)
-      {
-         return NotFound();
-      }
-
-      ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>>> response =
-         await _repository.GetAllProjects(CurrentPage, 50, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions,
-            new List<string> { Project.ApplicationReferenceNumber });
-
-      Paging = response.Body?.Paging;
-      Projects = response.Body?.Data.Select(ProjectListHelper.Build).ToList();
-      var currentSchool = Project.SchoolURN;
-      Projects = Projects!.Where(x => x.SchoolURN != currentSchool);
-      TotalProjects = response.Body?.Paging?.RecordCount ?? 0;
-
-      return Page();
-   }
-   protected async Task<IActionResult> SetProject(int id)
-   {
-      var project = await _repository.GetProjectById(id);
-      if (!project.Success)
-      {
-         // 404 logic
-         return NotFound();
-      }
-
-      Project = new ProjectViewModel(project.Body);
-      return Page();
-   }
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml
index 4d351d13b..b2c2c4968 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml
@@ -30,6 +30,17 @@
         <partial name="Shared/_ProjectListFilters" model="Model.Filters" />
     </div>
     <div class="govuk-grid-column-two-thirds">
+        <h2 class="govuk-heading-l" test-id="projectCount" data-cy="select-projectlist-filter-count">@(Model.TotalProjects) projects found</h2>
+
+        <div if="@Model.ProjectCount == 0">
+        <div class="govuk-heading-m govuk-!-margin-top-3">There are no matching results.</div>
+        <p class="govuk-body">Improve your results by:</p>
+        <ul class="govuk-list govuk-list--bullet govuk-body">
+        <li>double-checking your spelling</li>
+        <li>searching again with another school</li>
+        <li>removing some filters</li>
+        </ul>
+        </div> 
 
         <div if="@Model.ProjectCount > 0">
 
@@ -42,7 +53,7 @@
                 </thead>
             <tbody class="govuk-table__body">
             @{
-               <partial name="Shared/_ProjectListRows" model="Model.Projects" />
+               <partial name="Shared/_FormAMatProjectListRows" model="Model.Projects" />
             }
             </tbody>
          </table>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml.cs
index e14f25459..a5fef82f0 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/FormAMat/ProjectList.cshtml.cs
@@ -8,7 +8,6 @@
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -24,7 +23,7 @@ public ProjectListModel(IAcademyConversionProjectRepository repository)
    }
    public IEnumerable<BaseFormSection> Sections { get; set; }
    protected override ApiV2PagingInfo Paging { get; set; }
-   public IEnumerable<ProjectListViewModel> Projects { get; set; }
+   public IEnumerable<FormAMatProjectListViewModel> Projects { get; set; }
    public int ProjectCount => Projects.Count();
 
    public int TotalProjects { get; set; }
@@ -35,9 +34,9 @@ public ProjectListModel(IAcademyConversionProjectRepository repository)
    public async Task OnGetAsync()
    {
       Filters.PersistUsing(TempData).PopulateFrom(Request.Query);
-
-      ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>> response =
-         await _repository.GetMATProjects(CurrentPage, PageSize, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions, Filters.SelectedLocalAuthorities, Filters.SelectedAdvisoryBoardDates);
+      this.PagePath = "/FormAMat/ProjectList";
+      ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>> response =
+         await _repository.GetFormAMatProjects(CurrentPage, PageSize, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions, Filters.SelectedLocalAuthorities, Filters.SelectedAdvisoryBoardDates);
 
       Paging = response.Body?.Paging;
       Projects = response.Body?.Data.Select(ProjectListHelper.Build).ToList();
@@ -54,29 +53,5 @@ public async Task OnGetAsync()
          Filters.AvailableAdvisoryBoardDates = filterParametersResponse.Body.AdvisoryBoardDates;
       }
    }
-   public async Task<FileStreamResult> OnGetDownload()
-   {
-      Filters.PersistUsing(TempData).PopulateFrom(Request.Query);
-      ApiResponse<FileStreamResult> response = await _repository.DownloadProjectExport(CurrentPage, PageSize, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions, Filters.SelectedLocalAuthorities, Filters.SelectedAdvisoryBoardDates);
-
-      if (response.Success)
-      {
-         return response.Body;
-      }
-      else
-      {
-         var stream = new MemoryStream();
-         var writer = new StreamWriter(stream);
-         writer.Write("");
-         writer.Flush();
-         stream.Position = 0;
-
-         var fileStreamResult = new FileStreamResult(stream, "text/csv")
-         {
-            FileDownloadName = "empty.csv"
-         };
 
-         return fileStreamResult;
-      }
-   }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/NewProject/SearchSchool.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/NewProject/SearchSchool.cshtml.cs
index 06a60b4b3..e1968cdab 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/NewProject/SearchSchool.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/NewProject/SearchSchool.cshtml.cs
@@ -75,9 +75,9 @@ public async Task<IActionResult> OnPost(string ukprn, string redirect)
          return Page();
       }
 
-      string expectedUkprn = splitSearch[1];
+      string expectedUrn = splitSearch[splitSearch.Length - 1]; ;
 
-      var expectedEstablishment = await _getEstablishment.GetEstablishmentByUrn(expectedUkprn);
+      var expectedEstablishment = await _getEstablishment.GetEstablishmentByUrn(expectedUrn);
 
       if (expectedEstablishment.Name == null)
       {
@@ -88,7 +88,7 @@ public async Task<IActionResult> OnPost(string ukprn, string redirect)
 
       redirect = string.IsNullOrEmpty(redirect) ? Links.NewProject.SchoolApply.Page : redirect;
 
-      return RedirectToPage(redirect, new { urn = splitSearch[1], ukprn });
+      return RedirectToPage(redirect, new { urn = expectedUrn, ukprn });
    }
 
    private static string HighlightSearchMatch(string input, string toReplace, EstablishmentSearchResponse school)
@@ -103,6 +103,9 @@ private static string HighlightSearchMatch(string input, string toReplace, Estab
 
    private static string[] SplitOnBrackets(string input)
    {
-      return input.Split(new[] { '(', ')' }, 3, StringSplitOptions.None);
+      // return array containing one empty string if input string is null or empty
+      if (string.IsNullOrWhiteSpace(input)) return new string[1] { string.Empty };
+
+      return input.Split(new[] { '(', ')' }, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml
new file mode 100644
index 000000000..709d22988
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml
@@ -0,0 +1,77 @@
+@page "/fam-project-assignment/{id:int}"
+@using Dfe.PrepareConversions.Data.Models
+@using NetEscapades.AspNetCore.SecurityHeaders.TagHelpers
+@model Dfe.PrepareConversions.Pages.ProjectAssignment.FormAMatProjectAssignmentModel
+@{
+   ViewData["Title"] = "Who will be on this project?";
+}
+
+@section BeforeMain
+{
+   <a asp-page="@Links.TaskList.Index.Page" asp-route-id="@Model.Id" class="govuk-back-link">Back</a>
+}
+
+<div class="govuk-grid-row">
+   <div class="govuk-grid-column-two-thirds">
+
+      <span data-id="school-name" class="govuk-caption-l">@Model.TrustName</span>
+      <h1 class="govuk-heading-l">Who will be on this project?</h1>
+
+      <div class="govuk-form-group">
+         <label class="govuk-label" for="delivery-officer">
+            Delivery officer
+         </label>
+
+         <div id="delivery-officer-assigned-hint" class="govuk-hint">
+            The delivery officer responsible for this project
+         </div>
+
+         <form method="post" id="assign-user-form">
+            <input type="hidden" asp-for="@Model.Id"/>
+            <input type="hidden" id="delivery-officer-input" name="DeliveryOfficerInput"/>
+            <select name="SelectedName" class="autocomplete__menu govuk-select" id="delivery-officer">
+               <option value=""></option>
+               @{
+                  foreach (User deliveryOfficer in Model.DeliveryOfficers)
+                  {
+                     if (Model.SelectedDeliveryOfficer == deliveryOfficer.FullName)
+                     {
+                        <option value="@deliveryOfficer.FullName" selected>@deliveryOfficer.FullName</option>
+                     }
+                     else
+                     {
+                        <option value="@deliveryOfficer.FullName">@deliveryOfficer.FullName</option>
+                     }
+                  }
+               }
+            </select>
+
+            <div class="govuk-button-group govuk-!-margin-top-5">
+               <button class="govuk-button" data-module="govuk-button">
+                  Continue
+               </button>
+               <input type="hidden" name="UnassignDeliveryOfficer" id="UnassignDeliveryOfficer"/>
+               <span class="govuk-body govuk-!-margin-right-2 govuk-!-margin-left-1">or </span><a href="#" id="unassign-link" class="govuk-link">Unassign the delivery officer</a>
+            </div>
+         </form>
+      </div>
+
+   </div>
+</div>
+
+<script type="application/javascript" asp-add-nonce>
+    var deliveryOfficerSelect = document.querySelector('#delivery-officer');
+    accessibleAutocomplete.enhanceSelectElement({
+        selectElement: deliveryOfficerSelect
+    });
+      document.querySelector('#delivery-officer-input').value = document.querySelector('#delivery-officer').value;
+   
+    document.querySelector('#delivery-officer').addEventListener('change',function(){
+         document.querySelector('#delivery-officer-input').value = this.value;      
+    });
+
+    document.querySelector('#unassign-link').onclick = () =>{
+        document.querySelector('#UnassignDeliveryOfficer').value = true;
+        document.querySelector('form').submit();
+    };
+</script>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml.cs
new file mode 100644
index 000000000..810a3700e
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/FormAMatProjectAssignment.cshtml.cs
@@ -0,0 +1,66 @@
+using Dfe.PrepareConversions.Data;
+using Dfe.PrepareConversions.Data.Models;
+using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Data.Services.Interfaces;
+using Dfe.PrepareConversions.Extensions;
+using Dfe.PrepareConversions.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Dfe.PrepareConversions.Pages.ProjectAssignment;
+
+public class FormAMatProjectAssignmentModel : PageModel
+{
+   private readonly IAcademyConversionProjectRepository _academyConversionProjectRepository;
+   private readonly IUserRepository _userRepository;
+
+   public FormAMatProjectAssignmentModel(IUserRepository userRepository, IAcademyConversionProjectRepository academyConversionProjectRepository)
+   {
+      _academyConversionProjectRepository = academyConversionProjectRepository;
+      _userRepository = userRepository;
+   }
+
+   public string TrustName { get; private set; }
+   public int Id { get; set; }
+   public IEnumerable<User> DeliveryOfficers { get; set; }
+   public string SelectedDeliveryOfficer { get; set; }
+
+   public async Task<IActionResult> OnGet(int id)
+   {
+      ApiResponse<FormAMatProject> projectResponse = await _academyConversionProjectRepository.GetFormAMatProjectById(id);
+      Id = id;
+      TrustName = projectResponse.Body.ProposedTrustName;
+      SelectedDeliveryOfficer = projectResponse.Body?.AssignedUser?.FullName;
+
+      DeliveryOfficers = await _userRepository.GetAllUsers();
+
+      return Page();
+   }
+
+   public async Task<IActionResult> OnPost(int id, string selectedName, bool unassignDeliveryOfficer, string deliveryOfficerInput)
+   {
+      ApiResponse<FormAMatProject> projectResponse = await _academyConversionProjectRepository.GetFormAMatProjectById(id);
+
+      if (unassignDeliveryOfficer)
+      {
+         await _academyConversionProjectRepository.SetFormAMatAssignedUser(id, new SetAssignedUserModel(id, Guid.Empty, string.Empty, string.Empty));
+         TempData.SetNotification(NotificationType.Success, "Done", "Project is unassigned");
+      }
+      else if (!string.IsNullOrEmpty(selectedName))
+      {
+         IEnumerable<User> deliveryOfficers = await _userRepository.GetAllUsers();
+
+         var assignedUser = deliveryOfficers.SingleOrDefault(u => u.FullName == selectedName);
+
+         await _academyConversionProjectRepository.SetFormAMatAssignedUser(id, new SetAssignedUserModel(id, new Guid(assignedUser.Id), assignedUser.FullName, assignedUser.EmailAddress));
+         TempData.SetNotification(NotificationType.Success, "Done", "Project is assigned");
+      }
+
+
+      return RedirectToPage(Links.FormAMat.OtherSchoolsInMat.Page, new { id });
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/Index.cshtml.cs
index b11f076e6..36f07d25f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectAssignment/Index.cshtml.cs
@@ -43,6 +43,7 @@ public async Task<IActionResult> OnGet(int id)
 
    public async Task<IActionResult> OnPost(int id, string selectedName, bool unassignDeliveryOfficer, string deliveryOfficerInput)
    {
+      ApiResponse<AcademyConversionProject> projectResponse = await _academyConversionProjectRepository.GetProjectById(id);
       if (string.IsNullOrWhiteSpace(deliveryOfficerInput))
       {
          selectedName = string.Empty;
@@ -50,17 +51,16 @@ public async Task<IActionResult> OnPost(int id, string selectedName, bool unassi
 
       if (unassignDeliveryOfficer)
       {
-         UpdateAcademyConversionProject updatedProject = new() { AssignedUser = new User(Guid.Empty.ToString(), string.Empty, string.Empty) };
-
-         await _academyConversionProjectRepository.UpdateProject(id, updatedProject);
+         await _academyConversionProjectRepository.SetAssignedUser(id, new SetAssignedUserModel(id, Guid.Empty, string.Empty, string.Empty));
          TempData.SetNotification(NotificationType.Success, "Done", "Project is unassigned");
       }
       else if (!string.IsNullOrEmpty(selectedName))
       {
          IEnumerable<User> deliveryOfficers = await _userRepository.GetAllUsers();
-         UpdateAcademyConversionProject updatedProject = new() { AssignedUser = deliveryOfficers.SingleOrDefault(u => u.FullName == selectedName) };
 
-         await _academyConversionProjectRepository.UpdateProject(id, updatedProject);
+         var assignedUser = deliveryOfficers.SingleOrDefault(u => u.FullName == selectedName);
+
+         await _academyConversionProjectRepository.SetAssignedUser(id, new SetAssignedUserModel(id, new Guid(assignedUser.Id), assignedUser.FullName, assignedUser.EmailAddress));
          TempData.SetNotification(NotificationType.Success, "Done", "Project is assigned");
       }
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml
index aeaf02222..1b8f3cf90 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml
@@ -7,7 +7,7 @@
 
 @section BeforeMain
 {
-   <a asp-page="@Links.ProjectList.Index.Page" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+   <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
 }
 
 @if (Model.NewNote)
@@ -26,14 +26,9 @@
    </div>
 }
 
-@if (@Model.Project.AcademyTypeAndRoute.ToUpper() == AcademyTypeAndRoutes.FormAMat.RouteDescription().ToUpper())
-{
-   <partial name="Shared/_FormAMatProjectHeader" model="Model.Project" />
-}
-else
-{
-   <partial name="Shared/_ProjectHeader" model="Model.Project" />
-}
+
+<partial name="Shared/_ProjectHeader" model="Model.Project" />
+
 
 <div class="govuk-grid-column-two-thirds-full">
    <h2 class="govuk-heading-l govuk-!-margin-bottom govuk-!-font-size-36">Project notes</h2>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml.cs
index ca38b57e8..529c24d2a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectNotes/Index.cshtml.cs
@@ -1,6 +1,8 @@
 using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models;
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Primitives;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -9,6 +11,9 @@ namespace Dfe.PrepareConversions.Pages.ProjectNotes;
 
 public class IndexModel : BaseAcademyConversionProjectPageModel
 {
+   public string ReturnPage { get; set; }
+   public string ReturnId { get; set; }
+
    public IndexModel(IAcademyConversionProjectRepository repository) : base(repository)
    {
    }
@@ -20,9 +25,20 @@ public IndexModel(IAcademyConversionProjectRepository repository) : base(reposit
 
    public override async Task<IActionResult> OnGetAsync(int id)
    {
-      NewNote = (bool)(TempData["newNote"] ?? false);
       await base.OnGetAsync(id);
 
+      NewNote = (bool)(TempData["newNote"] ?? false);
+
+      ReturnPage = @Links.ProjectList.Index.Page;
+      var returnToFormAMatMenu = TempData["returnToFormAMatMenu"] as bool?;
+
+      if (Project.IsFormAMat && returnToFormAMatMenu.HasValue && returnToFormAMatMenu.Value)
+      {
+         ReturnId = Project.FormAMatProjectId.ToString();
+         ReturnPage = @Links.FormAMat.OtherSchoolsInMat.Page;
+         TempData["returnToFormAMatMenu"] = true;
+      }
+
       return Page();
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml
new file mode 100644
index 000000000..93fc7a65b
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml
@@ -0,0 +1,39 @@
+@using Dfe.Academisation.ExtensionMethods
+@using Dfe.PrepareConversions.TagHelpers
+@model ProjectListRowViewModel
+
+<tr class="govuk-table__row form-a-mat" data-cy="select-projectlist-filter-row">
+    <td class="govuk-table__cell">
+        <h2 class="govuk-caption-l govuk-!-margin-bottom-0 govuk-!-margin-top-1">
+            <strong>
+                <a id="@("school-name-" + Model.Index)" class="govuk-link" asp-page="@Links.TaskList.Index.Page" asp-route-id="@Model.Item.Id">@Model.Item.SchoolName</a>
+            </strong>
+            <span id="@("urn-" + Model.Index)">URN: @Model.Item.SchoolURN</span>
+        </h2>
+        <p class="govuk-!-margin-top-3">
+            <div data-cy="route">Route: @Model.Item.TypeAndRoute.RouteDescription()</div>
+            <div id="@("application-to-join-trust-" + Model.Index)">Application to join a trust: @Model.Item.NameOfTrust</div>
+            @if (@Model.Item.LocalAuthority.IsEmpty() is false)
+            {
+                <div id="@("local-authority-" + Model.Index)">Local authority: @Model.Item.LocalAuthority</div>
+            }
+        </p>
+    </td>
+    <td class="govuk-table__cell govuk-table__cell prepare-text-align-right">
+        <p class="govuk-!-margin-top-0">
+            <strong class="govuk-tag govuk-tag--@Model.Item.Status.Colour" id="project-status-@Model.Item.Id">@Model.Item.Status.Value</strong>
+        </p>
+        <p class="govuk-hint  govuk-!-margin-top-0">
+            <span id="application-received-date-@Model.Index">
+                Project created date: @Model.Item.CreatedOn.ToDateString()<br>
+            </span>
+            <span if="Model.Item.ShowHtbDate" id="@("Advisory-Board-date-" + Model.Index)">
+                @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)<br>
+            </span>
+            <span if="Model.Item.ShowProposedOpeningDate" id="@("opening-date-" + Model.Index)">
+                Opening date:
+                <span if="Model.Item.ProposedAcademyOpeningDate.IsPresent()">@Model.Item.ProposedAcademyOpeningDate</span>
+            </span>
+        </p>
+    </td>
+</tr>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml.cs
new file mode 100644
index 000000000..45be45349
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Dfe.PrepareConversions.Pages.Shared
+{
+    public class FormAMatProjectListRowModel : PageModel
+    {
+        public void OnGet()
+        {
+        }
+    }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectHeader.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectHeader.cshtml
index 3235a698d..cc8b443c8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectHeader.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectHeader.cshtml
@@ -1,28 +1,29 @@
 @model ProjectViewModel
 <div class="govuk-grid-row">
-   <div class="govuk-grid-column-full">
-      <div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
-         <div class="govuk-notification-banner__header">
-            <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
-               Important
-            </h2>
-         </div>
-         <div class="govuk-notification-banner__content">
-            <p class="govuk-notification-banner__heading">
-               You cannot currently use this service to create project templates for Form a MAT applications. You should use KIM instead.
-            </p>
-         </div>
-      </div>
-      <span class="govuk-caption-xl">URN @Model.SchoolURN</span>
-      <h1 class="govuk-heading-xl govuk-!-margin-bottom-2" data-cy="select-heading">
-         @Model.SchoolName
-      </h1>
-      <p class="govuk-body govuk-!-margin-bottom-8">
-         Route: Form a MAT
-      </p>
-   </div>
+    <div class="govuk-grid-column-full">
+        <span class="govuk-caption-xl">Application ref: @Model.ApplicationReferenceNumber</span>
+        <h1 class="govuk-heading-xl govuk-!-margin-bottom-2" data-cy="select-heading">
+            @Model.NameOfTrust
+        </h1>
+        <p class="govuk-body govuk-!-margin-bottom-5">
+            Assigned to:
 
-   <div class="govuk-grid-column-full">
-      <partial name="_FormAMatSubMenu" />
-   </div>
+            @if (Model.AssignedUser == null || string.IsNullOrWhiteSpace(Model?.AssignedUser.FullName))
+            {
+                <span data-id="assigned-user" class="empty">Empty</span>
+            }
+            else
+            {
+                <strong data-id="assigned-user">@Model.AssignedUser.FullName</strong>
+            }
+
+            <a class="govuk-link govuk-!-padding-left-50" asp-page="@Links.ProjectAssignment.Index.Page" asp-route-id="@Model.Id">Change</a>
+        </p>
+        <p class="govuk-!-margin-top-0  govuk-!-margin-bottom-8">
+            <strong class="govuk-tag govuk-tag--@Model.ProjectStatusColour" id="project-status-@Model.Id">@Model.ProjectStatus</strong>
+        </p>
+    </div>
+    <div class="govuk-grid-column-full">
+        <partial name="_FormAMatSubMenu" />
+    </div>
 </div>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectListRows.cshtml
new file mode 100644
index 000000000..707642e63
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatProjectListRows.cshtml
@@ -0,0 +1,67 @@
+@using Dfe.Academisation.ExtensionMethods
+@using Dfe.PrepareConversions.TagHelpers
+@model List<FormAMatProjectListViewModel>
+
+@{
+    var index = 0;
+
+    foreach (var project in Model)
+    {
+        var projectRow = project.Row(index);
+
+
+        var link = @Links.FormAMat.OtherSchoolsInMat.Page;
+
+        <tr class="govuk-table__row" data-cy="select-projectlist-filter-row">
+            <td class="govuk-table__cell">
+                <div class="govuk-!-margin-top-1 govuk-!-margin-bottom-2">
+                    <strong>
+                        <a id="@("trust-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id">@projectRow.Item.TrustName</a>
+                    </strong>
+                </div>
+                <div id="@("application-reference" + projectRow.Index)" class="govuk-!-margin-top-1">
+                    <strong>Application Reference:</strong>
+                    <span>@projectRow.Item.ApplciationReference</span>
+                </div>
+                <div id="@("region-" + projectRow.Index)" class="govuk-!-margin-top-1">
+                    <strong>Region:</strong>
+                    <span if="projectRow.Item.Regions.IsEmpty()" class="empty">Empty</span>
+                    <span if="projectRow.Item.Regions.IsPresent()">@projectRow.Item.Regions</span>
+                </div>
+                <div id="@("local-authority" + projectRow.Index)" class="govuk-!-margin-top-1">
+                    <strong>Local authority:</strong>
+                    <span if="projectRow.Item.LocalAuthorities.IsEmpty()" class="empty">Unconfirmed</span>
+                    <span if="projectRow.Item.LocalAuthorities.IsPresent()">@projectRow.Item.LocalAuthorities</span>
+                </div>
+                <div class="govuk-!-margin-top-1">
+                    <span id="@("schools-" + projectRow.Index)"><strong>Schools included</strong> @projectRow.Item.SchoolNames</span>
+                </div>
+                <div id="@("assigned-to-" + projectRow.Index)" class="do govuk-!-margin-top-1">
+                    <strong>Assigned to:</strong>
+                    <span if="projectRow.Item.AssignedTo.IsEmpty()" class="empty">Unassigned</span>
+                    <span if="projectRow.Item.AssignedTo.IsPresent()">@projectRow.Item.AssignedTo</span>
+                </div>
+                @{
+                    // Aggregating statuses
+                    var aggregatedStatuses = project.Status
+                    .GroupBy(s => s.Value)
+                    .Select(g => new { Status = g.Key, Count = g.Count(), Colour = g.First().Colour })
+                    .ToList();
+
+                    // Displaying aggregated statuses
+                    foreach (var status in aggregatedStatuses)
+                    {
+                        <div class="govuk-!-margin-top-2 govuk-!-margin-bottom-3">
+                            <strong class="govuk-tag govuk-tag--@status.Colour" id="project-status-@project.Id">
+                                @status.Count @status.Status
+                            </strong>
+                        </div>
+                    }
+                }
+            </td>
+        </tr>
+
+        index++;
+    }
+}
+
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatSubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatSubMenu.cshtml
index 9d3096fbc..0317e3e57 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatSubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FormAMatSubMenu.cshtml
@@ -5,20 +5,21 @@
 
 <nav class="moj-sub-navigation" aria-label="Sub navigation">
    <ul class="moj-sub-navigation__list govuk-!-margin-top-6">
-      <li class="moj-sub-navigation__item">
+        <li class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.FormAMat.OtherSchoolsInMat.Page"
+                           asp-route-id="@id">
+                Schools in this Trust
+            </sub-menu-link>
+        </li>
+        <li class="moj-sub-navigation__item">
          <sub-menu-link class="moj-sub-navigation__link"
                         asp-page="@Links.FormAMat.Index.Page"
                         asp-route-id="@id">
             School application form
          </sub-menu-link>
       </li>
-      <li class="moj-sub-navigation__item">
-         <sub-menu-link class="moj-sub-navigation__link"
-                        asp-page="@Links.FormAMat.OtherSchoolsInMat.Page"
-                        asp-route-id="@id">
-            Other schools in this MAT
-         </sub-menu-link>
-      </li>
+
         <li class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.ProjectNotes.Index.Page"
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
index 8c6e0535e..b7392f9fc 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
@@ -12,7 +12,7 @@
        ? string.Empty
        : "- Manage an academy conversion";
 
-    var isFormAMatPage = Context.Request.Path.Value.Contains("/form-a-mat/") ? true : false;
+    var isFormAMatPage = Context.Request.Path.Value.Contains("/form-a-mat/project-list") || Context.Request.Path.Value.Contains("/schools-in-this-mat/");
 }
 
 <!DOCTYPE html>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Pagination.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Pagination.cshtml
index 36e578113..be819a468 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Pagination.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Pagination.cshtml
@@ -1,4 +1,4 @@
-@model IPagination
+@model PaginatedPageModel
 @{
     var pagesToDisplay = new List<int>() { 1, Model.CurrentPage, Model.TotalPages };
     if (Model.HasPreviousPage)
@@ -13,7 +13,7 @@
         @if (Model.HasPreviousPage)
         {
             <li class="moj-pagination__item  moj-pagination__item--prev">
-                <a class="moj-pagination__link" asp-page="/ProjectList/Index" asp-route-currentPage="@Model.PreviousPage" test-id="previousPage">Previous<span class="govuk-visually-hidden"> set of pages</span></a>
+                <a class="moj-pagination__link" asp-page="@Model.PagePath" asp-route-currentPage="@Model.PreviousPage" test-id="previousPage">Previous<span class="govuk-visually-hidden"> set of pages</span></a>
             </li>
         }
         @for (var pageIdx = 0; pageIdx < Model.TotalPages; pageIdx++)
@@ -34,7 +34,7 @@
                 }
 
                 <li class="moj-pagination__item @markAsSelected">
-                    <a id="@pageNumber" asp-page="/ProjectList/Index" asp-route-currentPage="@pageNumber" class="moj-pagination__link"
+                    <a id="@pageNumber" asp-page="@Model.PagePath" asp-route-currentPage="@pageNumber" class="moj-pagination__link"
                     aria-label="@ariaLabel">@pageNumber</a>
                 </li>
 
@@ -51,7 +51,7 @@
         @if (Model.HasNextPage)
         {
             <li class="moj-pagination__item  moj-pagination__item--next">
-                <a class="moj-pagination__link" asp-page="/ProjectList/Index" asp-route-currentPage="@Model.NextPage" test-id="nextPage">Next<span class="govuk-visually-hidden"> set of pages</span></a>
+                <a class="moj-pagination__link" asp-page="@Model.PagePath" asp-route-currentPage="@Model.NextPage" test-id="nextPage">Next<span class="govuk-visually-hidden"> set of pages</span></a>
             </li>
         }
     </ul>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
index fe0fe6d9c..c44c689d6 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -10,14 +10,14 @@
         var projectRow = project.Row(index);
 
         var isFormAMat = project.IsFormAMat;
-        var matTypeClass = isFormAMat ? "form-a-mat" : "join-a-mat";
-        var link = isFormAMat ? @Links.FormAMat.Index.Page : @Links.TaskList.Index.Page;
+        var matTypeClass = isFormAMat ? "form-a-mat" : "join-a-mat";        
+        var link = @Links.TaskList.Index.Page;
 
         <tr class="govuk-table__row @matTypeClass" data-cy="select-projectlist-filter-row">
             <td class="govuk-table__cell">
                <div class="govuk-!-margin-top-1 govuk-!-margin-bottom-2">
                   <strong>
-                     <a id="@("school-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id">@projectRow.Item.SchoolName</a>
+                        <a id="@("school-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id" asp-route-returnToFormAMatMenu="False">@projectRow.Item.SchoolName</a>
                   </strong>
                </div>
                 <div class="govuk-!-margin-top-1">
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
index 34bb7646a..816d66bc3 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
@@ -1,7 +1,7 @@
 @using Dfe.PrepareConversions.TagHelpers
 @model ProjectTypeBase
 @{
-   var id = ViewContext.RouteData.Values["id"];
+    var id = ViewContext.RouteData.Values["id"];
 }
 
 <nav class="moj-sub-navigation" aria-label="Sub navigation">
@@ -14,13 +14,20 @@
          </sub-menu-link>
       </li>
 
-      <li if="@Model.IsVoluntary && !Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
+        <li if="@Model.IsVoluntary && !Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
          <sub-menu-link class="moj-sub-navigation__link"
                         asp-page="@Links.ApplicationForm.Index.Page"
                         asp-route-id="@id">
             School application form
          </sub-menu-link>
       </li>
+        <li if="@Model.IsFormAMat" class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.FormAMat.Index.Page"
+                           asp-route-id="@id">
+                School application form
+            </sub-menu-link>
+        </li>
 
         <li if="@Model.IsSponsored" class="moj-sub-navigation__item">
          <sub-menu-link class="moj-sub-navigation__link"
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml
index 737033827..35d457c8f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml
@@ -7,7 +7,7 @@
 
 @section BeforeMain
     {
-    <a asp-page="@Links.ProjectList.Index.Page" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+    <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
 }
 
     <partial name="_ProjectHeader" model="@Model.Project" />
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml.cs
index 462ec18b8..8f14c4e2b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordADecision.cshtml.cs
@@ -1,4 +1,7 @@
 using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models;
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 namespace Dfe.PrepareConversions.Pages.TaskList.Decision
 {
@@ -7,6 +10,25 @@ public class IndexModel : BaseAcademyConversionProjectPageModel
       public IndexModel(IAcademyConversionProjectRepository repository) : base(repository)
       {
       }
+      public string ReturnPage { get; set; }
+      public string ReturnId { get; set; }
+
+      public async override Task<IActionResult> OnGetAsync(int id)
+      {
+         await base.OnGetAsync(id);         
+         
+         ReturnPage = @Links.ProjectList.Index.Page;
+         var returnToFormAMatMenu = TempData["returnToFormAMatMenu"] as bool?;
+
+         if (Project.IsFormAMat && returnToFormAMatMenu.HasValue && returnToFormAMatMenu.Value)
+         {
+            ReturnId = Project.FormAMatProjectId.ToString();
+            ReturnPage = @Links.FormAMat.OtherSchoolsInMat.Page;
+            TempData["returnToFormAMatMenu"] = true;
+         }
+
+         return Page();
+      }
    }
 }
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml
index 049f9e937..57f9a7c59 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml
@@ -9,7 +9,10 @@
 
 @section BeforeMain
     {
-    <a asp-page="@Links.ProjectList.Index.Page" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+    <a asp-page="@Model.ReturnPage" asp-route-Id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+    @* <a href="@Model.ReturnLink" class="govuk-back-link">@Links.ProjectList.Index.BackText</a> *@
+    
+
 }
 
 @if (Model.ShowGenerateHtbTemplateError)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
index e3cff293a..985b10133 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
@@ -1,10 +1,11 @@
-using Dfe.PrepareConversions.Data.Models.KeyStagePerformance;
 using Dfe.PrepareConversions.Data.Services;
 using Dfe.PrepareConversions.Models;
 using Dfe.PrepareConversions.Models.ProjectList;
 using Dfe.PrepareConversions.Services;
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Primitives;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
@@ -25,6 +26,8 @@ public IndexModel(KeyStagePerformanceService keyStagePerformanceService,
 
    public bool ShowGenerateHtbTemplateError { get; set; }
    public TaskListViewModel TaskList { get; set; }
+   public string ReturnPage { get; set; }
+   public string ReturnId { get; set; }
 
    public void SetErrorPage(string errorPage)
    {
@@ -37,6 +40,31 @@ public override async Task<IActionResult> OnGetAsync(int id)
 
       IActionResult result = await SetProject(id);
 
+      ReturnPage = @Links.ProjectList.Index.Page;
+
+      bool? returnToFormAMatQueryValue = null;
+
+      if (Request.Query.TryGetValue("returnToFormAMatMenu", out StringValues returnQuery)) {
+         returnToFormAMatQueryValue = bool.Parse(returnQuery[0]);
+      };
+
+      if (returnToFormAMatQueryValue.HasValue && returnToFormAMatQueryValue.Value) {
+         TempData["returnToFormAMatMenu"] = true;
+      }
+
+      if (returnToFormAMatQueryValue.HasValue && !returnToFormAMatQueryValue.Value)
+      {
+         TempData["returnToFormAMatMenu"] = false;
+      }
+
+      var returnToFormAMatMenu = TempData["returnToFormAMatMenu"] as bool?;
+
+      if (Project.IsFormAMat && returnToFormAMatMenu.HasValue && returnToFormAMatMenu.Value) {
+         ReturnId = Project.FormAMatProjectId.ToString();
+         ReturnPage = @Links.FormAMat.OtherSchoolsInMat.Page;
+         TempData["returnToFormAMatMenu"] = true;
+      }   
+
       if ((result as StatusCodeResult)?.StatusCode == (int)HttpStatusCode.NotFound)
       {
          return NotFound();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
index 647775680..7f01173dd 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
@@ -57,7 +57,11 @@ public async Task<ApiResponse<AcademyConversionProject>> GetProjectById(int id)
 
       return project;
    }
-
+   public async Task<ApiResponse<FormAMatProject>> GetFormAMatProjectById(int id)
+   {
+      ApiResponse<FormAMatProject> project = await _innerRepository.GetFormAMatProjectById(id);
+      return project;
+   }
    public async Task CreateProject(CreateNewProject sponsoredProject)
    {
       await _innerRepository.CreateProject(sponsoredProject);
@@ -96,14 +100,21 @@ public async Task SetSchoolOverview(int id, SetSchoolOverviewModel updatedSchool
    {
       await _innerRepository.SetSchoolOverview(id, updatedSchoolOverview);
    }
-
+   public async Task SetAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      await _innerRepository.SetAssignedUser(id, updatedAssignedUser);
+   }
+   public async Task SetFormAMatAssignedUser(int id, SetAssignedUserModel updatedAssignedUser)
+   {
+      await _innerRepository.SetFormAMatAssignedUser(id, updatedAssignedUser);
+   }
    public async Task SetPerformanceData(int id, SetPerformanceDataModel setPerformanceDataModel)
    {
       await _innerRepository.SetPerformanceData(id, setPerformanceDataModel);
    }
 
-   public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMATProject>>>> GetMATProjects(int page, int count, string titleFilter = "", IEnumerable<string> statusFilters = null, IEnumerable<string> deliveryOfficerFilter = null, IEnumerable<string> regionsFilter = null, IEnumerable<string> localAuthoritiesFilter = null, IEnumerable<string> advisoryBoardDatesFilter = null)
+   public async Task<ApiResponse<ApiV2Wrapper<IEnumerable<FormAMatProject>>>> GetFormAMatProjects(int page, int count, string titleFilter = "", IEnumerable<string> statusFilters = null, IEnumerable<string> deliveryOfficerFilter = null, IEnumerable<string> regionsFilter = null, IEnumerable<string> localAuthoritiesFilter = null, IEnumerable<string> advisoryBoardDatesFilter = null)
    {
-      return await _innerRepository.GetMATProjects(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
+      return await _innerRepository.GetFormAMatProjects(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
index 9aac52fe8..b826e2a2a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
@@ -1,10 +1,10 @@
 using Dfe.Academisation.ExtensionMethods;
-using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
 using Dfe.PrepareConversions.Data.Models;
-using Dfe.PrepareConversions.Extensions;
+using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
 using Dfe.PrepareConversions.ViewModels;
 using System;
-using DocumentFormat.OpenXml.Drawing;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Dfe.PrepareConversions.Utils
 {
@@ -31,27 +31,34 @@ public static ProjectListViewModel Build(AcademyConversionProject academyConvers
          };
       }
 
-      public static ProjectListViewModel Build(FormAMATProject formAMATProject)
+      public static FormAMatProjectListViewModel Build(FormAMatProject formAMATProject)
       {
-         return new ProjectListViewModel
+         // This 
+         var project = formAMATProject.Projects.First();
+
+         return new FormAMatProjectListViewModel
          {
             Id = formAMATProject.Id.ToString(),
-            SchoolURN = formAMATProject.Urn.HasValue ? formAMATProject.Urn.ToString() : "",
-            SchoolName = formAMATProject.SchoolName,
-            LocalAuthority = formAMATProject.LocalAuthority,
-            NameOfTrust = formAMATProject.NameOfTrust,
-            ApplicationReceivedDate = formAMATProject.ApplicationReceivedDate.ToDateString(),
-            AssignedDate = formAMATProject.AssignedDate.ToDateString(),
-            HeadTeacherBoardDate = formAMATProject.HeadTeacherBoardDate.ToDateString(),
-            ProposedAcademyOpeningDate = formAMATProject.ProposedAcademyOpeningDate.ToDateString(),
-            Status = MapProjectStatus(formAMATProject.ProjectStatus),
-            AssignedUserFullName = formAMATProject.AssignedUser?.FullName,
-            CreatedOn = formAMATProject.CreatedOn,
-            TypeAndRoute = formAMATProject.AcademyTypeAndRoute,
-            Region = formAMATProject.Region
+            TrustName = formAMATProject.ProposedTrustName,
+            ApplciationReference = formAMATProject.ApplicationReference,
+            FirstProjectId = formAMATProject.Projects.First().Id,
+            AssignedTo = project.AssignedUser?.FullName,
+            LocalAuthorities = String.Join(", ", formAMATProject.Projects.Select(x => x.LocalAuthority).Distinct()),
+            AdvisoryBoardDate = project.HeadTeacherBoardDate.ToDateString(),
+            SchoolNames = String.Join(", ", formAMATProject.Projects.Select(x => x.SchoolName).Distinct()),
+            Regions = String.Join(", ", formAMATProject.Projects.Select(x => x.Region).Distinct()),
+            Status = GetFormAMatStatuses(formAMATProject.Projects)
          };
       }
-
+      public static List<ProjectStatus> GetFormAMatStatuses(ICollection<AcademyConversionProject> projects)
+      {
+         var statuses = new List<ProjectStatus>();
+         foreach (var project in projects)
+         {
+            statuses.Add(MapProjectStatus(project.ProjectStatus));
+         }
+         return statuses;
+      }
       public static ProjectStatus MapProjectStatus(string status)
       {
          const string green = nameof(green);
@@ -76,7 +83,7 @@ public static ProjectStatus MapProjectStatus(string status)
             _ => new ProjectStatus("PRE ADVISORY BOARD", yellow)
          };
       }
-   
+
       public static string MapPerformanceDataHint(string schoolType)
       {
          var sType = schoolType?.ToLower();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListRowViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListRowViewModel.cs
new file mode 100644
index 000000000..1b17329a6
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListRowViewModel.cs
@@ -0,0 +1,7 @@
+namespace Dfe.PrepareConversions.ViewModels;
+
+public class FormAMatProjectListRowViewModel
+{
+   public FormAMatProjectListViewModel Item { get; init; }
+   public int Index { get; init; }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListViewModel.cs
new file mode 100644
index 000000000..bea1c2ef8
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectListViewModel.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Dfe.PrepareConversions.ViewModels;
+
+public class FormAMatProjectListViewModel
+{
+   public string Id { get; init; }
+
+   public int FirstProjectId { get; init; }
+
+   public string TrustName { get; init; }
+   public string ApplciationReference { get; init; }
+
+   public string SchoolNames { get; init; }
+   public string AssignedUserFullName { get; init; }
+   public string Regions { get; set; }
+   public string AssignedTo { get; internal set; }
+   public string LocalAuthorities { get; internal set; }
+   public string AdvisoryBoardDate { get; internal set; }
+
+   public List<ProjectStatus> Status { get; init; }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectViewModel.cs
new file mode 100644
index 000000000..81693acf0
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FormAMatProjectViewModel.cs
@@ -0,0 +1,29 @@
+using Dfe.PrepareConversions.Data.Models;
+using System.Collections.Generic;
+
+namespace Dfe.PrepareConversions.ViewModels;
+
+public class FormAMatProjectViewModel
+{
+   public FormAMatProjectViewModel(FormAMatProject project)
+   {
+      Id = project.Id.ToString();
+      TrustName = project.ProposedTrustName;
+      ApplciationReference = project.ApplicationReference;
+      AssignedUserFullName = project.AssignedUser.FullName;
+      Projects = project.Projects;
+      //Status = project.;
+   }
+
+   public string Id { get; init; }
+   public string TrustName { get; init; }
+   public string ApplciationReference { get; init; }
+
+   public string AssignedUserFullName { get; init; }
+   public string Regions { get; set; }
+   public string AssignedTo { get; internal set; }
+   public string LocalAuthorities { get; internal set; }
+   public string AdvisoryBoardDate { get; internal set; }
+   public IEnumerable<AcademyConversionProject> Projects { get; set; }
+   public ProjectStatus Status { get; init; }
+}
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/PaginatedPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/PaginatedPageModel.cs
index 593ce775a..e58cb8f8b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/PaginatedPageModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/PaginatedPageModel.cs
@@ -12,7 +12,7 @@ public abstract class PaginatedPageModel : PageModel, IPagination
 
    [BindProperty(SupportsGet = true)]
    public int CurrentPage { get; set; } = 1;
-
+   public string PagePath { get; set; } = "/ProjectList/Index";
    public bool HasPreviousPage => CurrentPage > 1;
    public bool HasNextPage => string.IsNullOrWhiteSpace(Paging?.NextPageUrl) is false;
    public int StartingPage => CurrentPage > 5 ? CurrentPage - 5 : 1;
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
index 6ef92156c..64535e231 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Dfe.PrepareConversions.ViewModels;
 
-public class ProjectListViewModel: ProjectTypeBase
+public class ProjectListViewModel : ProjectTypeBase
 {
    public string Id { get; init; }
    public string NameOfTrust { get; init; }
@@ -23,4 +23,6 @@ public class ProjectListViewModel: ProjectTypeBase
    public bool ShowProposedOpeningDate => string.IsNullOrWhiteSpace(ProposedAcademyOpeningDate) is false;
 
    protected override string TypeAndRouteValue => TypeAndRoute;
+
+
 }
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
index cb829d498..4b1a23dd1 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
@@ -11,6 +11,7 @@ public class ProjectViewModel : ProjectTypeBase
    public ProjectViewModel(AcademyConversionProject project)
    {
       Id = project.Id.ToString();
+      FormAMatProjectId = project.FormAMatProjectId;
       ProjectStatus = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Value;
       ProjectStatusColour = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Colour;
       ApplicationReferenceNumber = project.ApplicationReferenceNumber;
@@ -128,6 +129,7 @@ public ProjectViewModel(AcademyConversionProject project)
    }
 
    public string Id { get; }
+   public int? FormAMatProjectId { get; }
    public string ProjectStatus { get; }
    public string ProjectStatusColour { get; }
    public string ApplicationReferenceNumber { get; set; }
@@ -254,5 +256,7 @@ public ProjectViewModel(AcademyConversionProject project)
    public ICollection<ProjectNote> Notes { get; }
 
    protected override string TypeAndRouteValue => AcademyTypeAndRoute;
+
    public override bool IsExternalSchoolApplication => string.IsNullOrEmpty(this.ApplicationReferenceNumber);
+
 }