diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5814f520..b676c823 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased](https://github.com/defra/pafs_core/tree/HEAD)
+## [Unreleased](https://github.com/DEFRA/pafs_core/tree/HEAD)
 
-[Full Changelog](https://github.com/defra/pafs_core/compare/v1.0.1...HEAD)
+[Full Changelog](https://github.com/DEFRA/pafs_core/compare/v1.0.1...HEAD)
 
 **Fixed bugs:**
 
@@ -10,7 +10,7 @@
 - RUBY 3889 pafs changes to earliest start date and last financial year [\#1092](https://github.com/DEFRA/pafs_core/pull/1092) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-3889\] Fix bug with financial year confirmation heading to financial\_year\_alternative [\#1088](https://github.com/DEFRA/pafs_core/pull/1088) ([jjromeo](https://github.com/jjromeo))
 - RUBY 3889 pafs changes to earliest start date and last financial year [\#1075](https://github.com/DEFRA/pafs_core/pull/1075) ([jjromeo](https://github.com/jjromeo))
-- \[RUBY-3889\] Remove NOT NULL constraint and default from `date\_change\_requires\_confirmation` in `pafs\_core\_projects` [\#1069](https://github.com/DEFRA/pafs_core/pull/1069) ([jjromeo](https://github.com/jjromeo))
+- \[RUBY-3889\] Remove NOT NULL constraint and default from `date_change_requires_confirmation` in `pafs_core_projects` [\#1069](https://github.com/DEFRA/pafs_core/pull/1069) ([jjromeo](https://github.com/jjromeo))
 - Fix/ruby 3889 bootstrap attributes not defined [\#1066](https://github.com/DEFRA/pafs_core/pull/1066) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - RUBY 3889 pafs changes to earliest start date and last financial year [\#1064](https://github.com/DEFRA/pafs_core/pull/1064) ([jjromeo](https://github.com/jjromeo))
 - Add back code allowing js that was mistakenly removed [\#1051](https://github.com/DEFRA/pafs_core/pull/1051) ([jjromeo](https://github.com/jjromeo))
@@ -20,6 +20,8 @@
 
 **Merged pull requests:**
 
+- Update carbon target reduction rates [\#1141](https://github.com/DEFRA/pafs_core/pull/1141) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Downgraded github\_changelog\_generator to working version 1.15.2 and updated CHANGELOG [\#1137](https://github.com/DEFRA/pafs_core/pull/1137) ([brujeo](https://github.com/brujeo))
 - Feature/ruby 4066 validation message [\#1136](https://github.com/DEFRA/pafs_core/pull/1136) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Update CHANGELOG [\#1119](https://github.com/DEFRA/pafs_core/pull/1119) ([brujeo](https://github.com/brujeo))
 - Bump pg from 1.5.9 to 1.6.2 [\#1117](https://github.com/DEFRA/pafs_core/pull/1117) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -60,9 +62,9 @@
 - Update Dependabot configuration [\#1018](https://github.com/DEFRA/pafs_core/pull/1018) ([brujeo](https://github.com/brujeo))
 - Update version [\#1017](https://github.com/DEFRA/pafs_core/pull/1017) ([brujeo](https://github.com/brujeo))
 
-## [v1.0.1](https://github.com/defra/pafs_core/tree/v1.0.1) (2025-04-11)
+## [v1.0.1](https://github.com/DEFRA/pafs_core/tree/v1.0.1) (2025-04-11)
 
-[Full Changelog](https://github.com/defra/pafs_core/compare/v1.0...v1.0.1)
+[Full Changelog](https://github.com/DEFRA/pafs_core/compare/v1.0...v1.0.1)
 
 **Fixed bugs:**
 
@@ -71,6 +73,19 @@
 - Fix/ruby 3038 funding row totals [\#876](https://github.com/DEFRA/pafs_core/pull/876) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Fixing translation misssing error in fcrm report [\#762](https://github.com/DEFRA/pafs_core/pull/762) ([brujeo](https://github.com/brujeo))
 - Fixing area factory [\#711](https://github.com/DEFRA/pafs_core/pull/711) ([brujeo](https://github.com/brujeo))
+- Fix/ruby 2485 pafs unable to unselect my project does not move any properties to a lower flood risk category check box after [\#626](https://github.com/DEFRA/pafs_core/pull/626) ([brujeo](https://github.com/brujeo))
+- Fix issue with could start early not being taken into account [\#603](https://github.com/DEFRA/pafs_core/pull/603) ([jjromeo](https://github.com/jjromeo))
+- Fix form-group id error [\#491](https://github.com/DEFRA/pafs_core/pull/491) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Set title for benefit area page [\#482](https://github.com/DEFRA/pafs_core/pull/482) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix page titles [\#481](https://github.com/DEFRA/pafs_core/pull/481) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Specify PafsCore namespace for ApplicationController inheritance [\#446](https://github.com/DEFRA/pafs_core/pull/446) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- add calculator version check on submission [\#434](https://github.com/DEFRA/pafs_core/pull/434) ([kennyevil](https://github.com/kennyevil))
+- fix missing page title [\#430](https://github.com/DEFRA/pafs_core/pull/430) ([kennyevil](https://github.com/kennyevil))
+- adjust column widths to make columns D & E more visible [\#424](https://github.com/DEFRA/pafs_core/pull/424) ([kennyevil](https://github.com/kennyevil))
+- added ids for summary page and removed some typos [\#423](https://github.com/DEFRA/pafs_core/pull/423) ([kennyevil](https://github.com/kennyevil))
+- Remove 2026 maximum for om figures [\#422](https://github.com/DEFRA/pafs_core/pull/422) ([kennyevil](https://github.com/kennyevil))
+- fix content  typos [\#413](https://github.com/DEFRA/pafs_core/pull/413) ([kennyevil](https://github.com/kennyevil))
+- Feature/ruby 1930 fix issues [\#405](https://github.com/DEFRA/pafs_core/pull/405) ([kennyevil](https://github.com/kennyevil))
 
 **Merged pull requests:**
 
@@ -102,7 +117,7 @@
 - RUBY 3212 pafs proposals with duplicate names are not sent to pipeline [\#903](https://github.com/DEFRA/pafs_core/pull/903) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-3220\] Add validation for project name format [\#902](https://github.com/DEFRA/pafs_core/pull/902) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-3142\] make PFC requirement optional for some project types [\#901](https://github.com/DEFRA/pafs_core/pull/901) ([brujeo](https://github.com/brujeo))
-- \[RUBY-3226\] Update `defra\_ruby\_template` dependency to version 5.0 in Gemfile.lock and pafs\_core.gemspec [\#900](https://github.com/DEFRA/pafs_core/pull/900) ([jjromeo](https://github.com/jjromeo))
+- \[RUBY-3226\] Update `defra_ruby_template` dependency to version 5.0 in Gemfile.lock and pafs\_core.gemspec [\#900](https://github.com/DEFRA/pafs_core/pull/900) ([jjromeo](https://github.com/jjromeo))
 - Bump rubocop-rails from 2.25.1 to 2.26.0 [\#899](https://github.com/DEFRA/pafs_core/pull/899) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump faraday from 2.10.1 to 2.11.0 [\#898](https://github.com/DEFRA/pafs_core/pull/898) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rexml from 3.3.5 to 3.3.6 [\#896](https://github.com/DEFRA/pafs_core/pull/896) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -190,10 +205,301 @@
 - RUBY-2400: Adding missing DB indexes [\#645](https://github.com/DEFRA/pafs_core/pull/645) ([brujeo](https://github.com/brujeo))
 - Adding a hint to earliest start date page [\#628](https://github.com/DEFRA/pafs_core/pull/628) ([brujeo](https://github.com/brujeo))
 - Fix/ruby 2485 adjustments [\#627](https://github.com/DEFRA/pafs_core/pull/627) ([brujeo](https://github.com/brujeo))
+- Remove redundant debug statements [\#615](https://github.com/DEFRA/pafs_core/pull/615) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Chore/rails7 [\#610](https://github.com/DEFRA/pafs_core/pull/610) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Chore/rails7 [\#608](https://github.com/DEFRA/pafs_core/pull/608) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2436 pafs add secondary risk sources to json [\#607](https://github.com/DEFRA/pafs_core/pull/607) ([brujeo](https://github.com/brujeo))
+- Fix/change area no previous owner [\#605](https://github.com/DEFRA/pafs_core/pull/605) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump defra\_ruby\_alert gem [\#602](https://github.com/DEFRA/pafs_core/pull/602) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- feature/RUBY 2435 PAFs Earliest start date [\#596](https://github.com/DEFRA/pafs_core/pull/596) ([jjromeo](https://github.com/jjromeo))
+- Fix values table footer cell HTML classes [\#595](https://github.com/DEFRA/pafs_core/pull/595) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Handle missing owner in moderation presenter [\#594](https://github.com/DEFRA/pafs_core/pull/594) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- debug download [\#593](https://github.com/DEFRA/pafs_core/pull/593) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- adjust debugging [\#591](https://github.com/DEFRA/pafs_core/pull/591) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Remove govuk-grid-column-three-quarters from table css to increase size of table [\#588](https://github.com/DEFRA/pafs_core/pull/588) ([jjromeo](https://github.com/jjromeo))
+- Allow removing unselected gia funding values [\#586](https://github.com/DEFRA/pafs_core/pull/586) ([jjromeo](https://github.com/jjromeo))
+- Add other\_additional\_grant\_in\_aid boolean to migration as per new AC [\#585](https://github.com/DEFRA/pafs_core/pull/585) ([jjromeo](https://github.com/jjromeo))
+- Remove program upload related code [\#584](https://github.com/DEFRA/pafs_core/pull/584) ([jjromeo](https://github.com/jjromeo))
+- Remove old area\_project when changing RMA [\#582](https://github.com/DEFRA/pafs_core/pull/582) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update change project area service [\#579](https://github.com/DEFRA/pafs_core/pull/579) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- fixes/RUBY 1965 PAFS Additional FCRM GIA 2 Add estimated funding spend for each year [\#578](https://github.com/DEFRA/pafs_core/pull/578) ([jjromeo](https://github.com/jjromeo))
+- feature/RUBY 2431 PAFS Migrating Additional GiA existing values to Other addition5D5D5Dal grant in aid [\#576](https://github.com/DEFRA/pafs_core/pull/576) ([jjromeo](https://github.com/jjromeo))
+- Add FSM state transition to support download regeneration [\#575](https://github.com/DEFRA/pafs_core/pull/575) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add the new grant in aid values to the JSON export [\#574](https://github.com/DEFRA/pafs_core/pull/574) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- feature/RUBY 1965 PAFS Additional FCRM GIA 2 Add estimated funding spend for each year [\#573](https://github.com/DEFRA/pafs_core/pull/573) ([jjromeo](https://github.com/jjromeo))
+- Always allow area download generation [\#572](https://github.com/DEFRA/pafs_core/pull/572) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- feature/additional fcrm grant in aid [\#571](https://github.com/DEFRA/pafs_core/pull/571) ([jjromeo](https://github.com/jjromeo))
+- Add 'generate programme again' link [\#569](https://github.com/DEFRA/pafs_core/pull/569) ([endofunky](https://github.com/endofunky))
+- Text fixes [\#568](https://github.com/DEFRA/pafs_core/pull/568) ([jjromeo](https://github.com/jjromeo))
+- Bump aws-sdk-s3 from 1.119.1 to 1.119.2 [\#567](https://github.com/DEFRA/pafs_core/pull/567) ([dependabot[bot]](https://github.com/apps/dependabot))
+- feature/add completion of business case date [\#566](https://github.com/DEFRA/pafs_core/pull/566) ([jjromeo](https://github.com/jjromeo))
+- Bump rack-cors from 2.0.0 to 2.0.1 [\#565](https://github.com/DEFRA/pafs_core/pull/565) ([dependabot[bot]](https://github.com/apps/dependabot))
+- last\_update and pso\_name columns [\#563](https://github.com/DEFRA/pafs_core/pull/563) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- RUBY-2388 Fix to argument error caused by sending keyword argument into single splat operator method [\#562](https://github.com/DEFRA/pafs_core/pull/562) ([jjromeo](https://github.com/jjromeo))
+- Fix download all projects [\#557](https://github.com/DEFRA/pafs_core/pull/557) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Chore/download all debug [\#556](https://github.com/DEFRA/pafs_core/pull/556) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- fix download error logging [\#555](https://github.com/DEFRA/pafs_core/pull/555) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Airbrake notifications [\#554](https://github.com/DEFRA/pafs_core/pull/554) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- download error logging [\#553](https://github.com/DEFRA/pafs_core/pull/553) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Download error logging [\#552](https://github.com/DEFRA/pafs_core/pull/552) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Log download errors [\#551](https://github.com/DEFRA/pafs_core/pull/551) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Include exception message in download-all error [\#550](https://github.com/DEFRA/pafs_core/pull/550) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/projects search [\#546](https://github.com/DEFRA/pafs_core/pull/546) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix project search HTML [\#545](https://github.com/DEFRA/pafs_core/pull/545) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/change rma [\#544](https://github.com/DEFRA/pafs_core/pull/544) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Change project area [\#543](https://github.com/DEFRA/pafs_core/pull/543) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add CHANGELOG [\#539](https://github.com/DEFRA/pafs_core/pull/539) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Area import and rename [\#535](https://github.com/DEFRA/pafs_core/pull/535) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Errbit configuration [\#527](https://github.com/DEFRA/pafs_core/pull/527) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix 2040 outcomes bug [\#507](https://github.com/DEFRA/pafs_core/pull/507) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump loofah from 2.19.0 to 2.19.1 [\#502](https://github.com/DEFRA/pafs_core/pull/502) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump json\_schemer from 0.2.23 to 0.2.24 [\#501](https://github.com/DEFRA/pafs_core/pull/501) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop from 1.39.0 to 1.40.0 [\#500](https://github.com/DEFRA/pafs_core/pull/500) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.13.9 to 1.13.10 [\#499](https://github.com/DEFRA/pafs_core/pull/499) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Cookies cleanup [\#498](https://github.com/DEFRA/pafs_core/pull/498) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump aws-sdk-s3 from 1.117.1 to 1.117.2 [\#497](https://github.com/DEFRA/pafs_core/pull/497) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Layout fixes [\#496](https://github.com/DEFRA/pafs_core/pull/496) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Further layout changes [\#495](https://github.com/DEFRA/pafs_core/pull/495) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Table layout and content changes [\#494](https://github.com/DEFRA/pafs_core/pull/494) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix layout issues [\#493](https://github.com/DEFRA/pafs_core/pull/493) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- govuk DR 2 fixes [\#492](https://github.com/DEFRA/pafs_core/pull/492) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- GOVUK FormBuilder fixes [\#490](https://github.com/DEFRA/pafs_core/pull/490) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add govuk formbuilder [\#486](https://github.com/DEFRA/pafs_core/pull/486) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update page titles [\#479](https://github.com/DEFRA/pafs_core/pull/479) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add missing space in prompt [\#472](https://github.com/DEFRA/pafs_core/pull/472) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump gem versions and apply rubocop fix [\#466](https://github.com/DEFRA/pafs_core/pull/466) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump gem versions and apply rubocop fix [\#463](https://github.com/DEFRA/pafs_core/pull/463) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix add\_template\_helper issue [\#460](https://github.com/DEFRA/pafs_core/pull/460) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reinstate base download initializer [\#456](https://github.com/DEFRA/pafs_core/pull/456) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Upgrade to ruby3 [\#455](https://github.com/DEFRA/pafs_core/pull/455) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Merge develop into main [\#454](https://github.com/DEFRA/pafs_core/pull/454) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump sprockets from 3.7.2 to 4.1.1 [\#452](https://github.com/DEFRA/pafs_core/pull/452) ([dependabot[bot]](https://github.com/apps/dependabot))
+- CI updates [\#450](https://github.com/DEFRA/pafs_core/pull/450) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump faraday from 2.5.2 to 2.6.0 [\#448](https://github.com/DEFRA/pafs_core/pull/448) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Merge develop into main [\#447](https://github.com/DEFRA/pafs_core/pull/447) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Bump shoulda-matchers from 5.1.0 to 5.2.0 [\#445](https://github.com/DEFRA/pafs_core/pull/445) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rails from 6.0.5.1 to 6.0.6 [\#444](https://github.com/DEFRA/pafs_core/pull/444) ([dependabot[bot]](https://github.com/apps/dependabot))
+- RUBY-2098 content update [\#443](https://github.com/DEFRA/pafs_core/pull/443) ([timstone](https://github.com/timstone))
+- Merge develop into main [\#442](https://github.com/DEFRA/pafs_core/pull/442) ([kennyevil](https://github.com/kennyevil))
+- adjust column widths on fpo page [\#441](https://github.com/DEFRA/pafs_core/pull/441) ([kennyevil](https://github.com/kennyevil))
+- use full page for fpos and ceos [\#440](https://github.com/DEFRA/pafs_core/pull/440) ([kennyevil](https://github.com/kennyevil))
+- Bump webmock from 3.17.1 to 3.18.1 [\#439](https://github.com/DEFRA/pafs_core/pull/439) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Flooding outcomes 2040 and benifitting content update [\#438](https://github.com/DEFRA/pafs_core/pull/438) ([timstone](https://github.com/timstone))
+- Bump faraday from 2.5.1 to 2.5.2 [\#437](https://github.com/DEFRA/pafs_core/pull/437) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump webmock from 3.16.0 to 3.17.1 [\#436](https://github.com/DEFRA/pafs_core/pull/436) ([dependabot[bot]](https://github.com/apps/dependabot))
+- add N/A display for environmental benefits [\#435](https://github.com/DEFRA/pafs_core/pull/435) ([kennyevil](https://github.com/kennyevil))
+- Bump faraday from 2.4.0 to 2.5.1 [\#433](https://github.com/DEFRA/pafs_core/pull/433) ([dependabot[bot]](https://github.com/apps/dependabot))
+- update form labels and summary titles [\#431](https://github.com/DEFRA/pafs_core/pull/431) ([kennyevil](https://github.com/kennyevil))
+- Bump secure\_headers from 6.3.4 to 6.4.0 [\#429](https://github.com/DEFRA/pafs_core/pull/429) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump faraday from 2.3.0 to 2.4.0 [\#428](https://github.com/DEFRA/pafs_core/pull/428) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump webmock from 3.14.0 to 3.16.0 [\#427](https://github.com/DEFRA/pafs_core/pull/427) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump dotenv from 2.7.6 to 2.8.1 [\#426](https://github.com/DEFRA/pafs_core/pull/426) ([dependabot[bot]](https://github.com/apps/dependabot))
+- change scope of translations on nfm summary [\#421](https://github.com/DEFRA/pafs_core/pull/421) ([kennyevil](https://github.com/kennyevil))
+- update nfm summary section [\#420](https://github.com/DEFRA/pafs_core/pull/420) ([kennyevil](https://github.com/kennyevil))
+- update new om2 and om3 keys on presenter [\#419](https://github.com/DEFRA/pafs_core/pull/419) ([kennyevil](https://github.com/kennyevil))
+- Bump nokogiri from 1.13.6 to 1.13.8 [\#418](https://github.com/DEFRA/pafs_core/pull/418) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump tzinfo from 1.2.9 to 1.2.10 [\#417](https://github.com/DEFRA/pafs_core/pull/417) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/ruby 1958 1959 1960 update page titles [\#416](https://github.com/DEFRA/pafs_core/pull/416) ([kennyevil](https://github.com/kennyevil))
+- add non-residential properties to coastal erosion page [\#415](https://github.com/DEFRA/pafs_core/pull/415) ([kennyevil](https://github.com/kennyevil))
+- Feature/ruby 1920 1958 1959 fix wording and link [\#414](https://github.com/DEFRA/pafs_core/pull/414) ([kennyevil](https://github.com/kennyevil))
+- Bump climate\_control from 1.0.1 to 1.2.0 [\#412](https://github.com/DEFRA/pafs_core/pull/412) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/ruby 1959 2040 households [\#411](https://github.com/DEFRA/pafs_core/pull/411) ([kennyevil](https://github.com/kennyevil))
+- add om2d and om2e measures [\#410](https://github.com/DEFRA/pafs_core/pull/410) ([kennyevil](https://github.com/kennyevil))
+- Bump rails from 6.0.5 to 6.0.5.1 [\#409](https://github.com/DEFRA/pafs_core/pull/409) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump activerecord from 6.0.5 to 6.0.5.1 [\#407](https://github.com/DEFRA/pafs_core/pull/407) ([dependabot[bot]](https://github.com/apps/dependabot))
+- add separate values for om4a and om4b attributes [\#406](https://github.com/DEFRA/pafs_core/pull/406) ([kennyevil](https://github.com/kennyevil))
+- fix typos in error messages and hint text [\#404](https://github.com/DEFRA/pafs_core/pull/404) ([kennyevil](https://github.com/kennyevil))
+- Bump rails-html-sanitizer from 1.4.2 to 1.4.3 [\#403](https://github.com/DEFRA/pafs_core/pull/403) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/ruby 1930 add new om4 measures [\#402](https://github.com/DEFRA/pafs_core/pull/402) ([kennyevil](https://github.com/kennyevil))
+- Bump secure\_headers from 6.3.3 to 6.3.4 [\#401](https://github.com/DEFRA/pafs_core/pull/401) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/ruby 1920 add nfm steps [\#400](https://github.com/DEFRA/pafs_core/pull/400) ([kennyevil](https://github.com/kennyevil))
+- Feature/ruby 1954 add new areas [\#399](https://github.com/DEFRA/pafs_core/pull/399) ([kennyevil](https://github.com/kennyevil))
+- Add nfm measures to camc3 presenter [\#398](https://github.com/DEFRA/pafs_core/pull/398) ([kennyevil](https://github.com/kennyevil))
+- remove other nfm text value if unselected [\#397](https://github.com/DEFRA/pafs_core/pull/397) ([kennyevil](https://github.com/kennyevil))
+- Add error message if user does not provide the name of other flood risk measure [\#396](https://github.com/DEFRA/pafs_core/pull/396) ([kennyevil](https://github.com/kennyevil))
+- Add validation for natural flood risks section [\#395](https://github.com/DEFRA/pafs_core/pull/395) ([kennyevil](https://github.com/kennyevil))
+- add ids to nfm summary section [\#394](https://github.com/DEFRA/pafs_core/pull/394) ([kennyevil](https://github.com/kennyevil))
+- add steps for natural flood risk measures [\#392](https://github.com/DEFRA/pafs_core/pull/392) ([kennyevil](https://github.com/kennyevil))
+- Bump rubyXL from 3.4.24 to 3.4.25 [\#390](https://github.com/DEFRA/pafs_core/pull/390) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update error message for v9 PF calculator [\#389](https://github.com/DEFRA/pafs_core/pull/389) ([kennyevil](https://github.com/kennyevil))
+- Update error message for PF calculator version [\#388](https://github.com/DEFRA/pafs_core/pull/388) ([kennyevil](https://github.com/kennyevil))
+- Bump vcr from 6.0.0 to 6.1.0 [\#387](https://github.com/DEFRA/pafs_core/pull/387) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump overcommit from 0.58.0 to 0.59.1 [\#386](https://github.com/DEFRA/pafs_core/pull/386) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump json\_schemer from 0.2.18 to 0.2.21 [\#385](https://github.com/DEFRA/pafs_core/pull/385) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump roo from 2.8.3 to 2.9.0 [\#381](https://github.com/DEFRA/pafs_core/pull/381) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump capybara from 3.36.0 to 3.37.1 [\#380](https://github.com/DEFRA/pafs_core/pull/380) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Ensure service accepts v2 2020 PF calculator [\#379](https://github.com/DEFRA/pafs_core/pull/379) ([kennyevil](https://github.com/kennyevil))
+- Bump rubyXL from 3.4.18 to 3.4.24 [\#378](https://github.com/DEFRA/pafs_core/pull/378) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rails from 6.0.4.1 to 6.0.5 [\#377](https://github.com/DEFRA/pafs_core/pull/377) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump faraday from 1.8.0 to 2.3.0 [\#375](https://github.com/DEFRA/pafs_core/pull/375) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump aws-sdk-s3 from 1.104.0 to 1.114.0 [\#373](https://github.com/DEFRA/pafs_core/pull/373) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rspec-rails from 5.0.2 to 5.1.2 [\#368](https://github.com/DEFRA/pafs_core/pull/368) ([dependabot[bot]](https://github.com/apps/dependabot))
+- APP-2715 - Change any text referring to  ‘Growth’ funding to read  ‘Additional’ Grant-in-Aid’. [\#346](https://github.com/DEFRA/pafs_core/pull/346) ([georges1996](https://github.com/georges1996))
+- Bump kaminari from 1.2.1 to 1.2.2 [\#340](https://github.com/DEFRA/pafs_core/pull/340) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump shoulda-matchers from 5.0.0 to 5.1.0 [\#339](https://github.com/DEFRA/pafs_core/pull/339) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump sprockets-rails from 3.2.2 to 3.4.2 [\#334](https://github.com/DEFRA/pafs_core/pull/334) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update cookie policy page [\#324](https://github.com/DEFRA/pafs_core/pull/324) ([georges1996](https://github.com/georges1996))
+- Get Github actions running automated tests [\#323](https://github.com/DEFRA/pafs_core/pull/323) ([georges1996](https://github.com/georges1996))
+- Bump actionview from 6.0.3.2 to 6.0.3.3 [\#313](https://github.com/DEFRA/pafs_core/pull/313) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[NO-JIRA\] Move to ruby-defra-alerts [\#312](https://github.com/DEFRA/pafs_core/pull/312) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-615\] Readd backlink on cookies page [\#311](https://github.com/DEFRA/pafs_core/pull/311) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-604\] Add cookie page [\#310](https://github.com/DEFRA/pafs_core/pull/310) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-613\] Add switch to skip PSO confirmation on submit [\#309](https://github.com/DEFRA/pafs_core/pull/309) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-612\] Use file path upload for s3 [\#308](https://github.com/DEFRA/pafs_core/pull/308) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-612\] Reduce memory usage when uploading to S3 [\#307](https://github.com/DEFRA/pafs_core/pull/307) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-608\] Fix for email notification on FCERM1 generation [\#306](https://github.com/DEFRA/pafs_core/pull/306) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-609\] Touch user when updating areas [\#305](https://github.com/DEFRA/pafs_core/pull/305) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-606\] Use presigned URLs for file downloads [\#304](https://github.com/DEFRA/pafs_core/pull/304) ([MattHallEA](https://github.com/MattHallEA))
+- Bump kaminari from 1.2.0 to 1.2.1 [\#303](https://github.com/DEFRA/pafs_core/pull/303) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[PM-603\] Add ability to generate a complete FCRM1 [\#302](https://github.com/DEFRA/pafs_core/pull/302) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-588\] Move to use checkboxes instead of radio buttons on the funding contributor values form [\#301](https://github.com/DEFRA/pafs_core/pull/301) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-587\] Upgrade to Rails 5.2 [\#300](https://github.com/DEFRA/pafs_core/pull/300) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-577\] Add carbon to the FCRM1 [\#299](https://github.com/DEFRA/pafs_core/pull/299) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-585\] Fix duplicate ids when adding funding contributors [\#298](https://github.com/DEFRA/pafs_core/pull/298) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-578\] Remove 'area' from download program page [\#297](https://github.com/DEFRA/pafs_core/pull/297) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-580\] Fix for funding value total [\#296](https://github.com/DEFRA/pafs_core/pull/296) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-572\] Add confidence to the project journey [\#294](https://github.com/DEFRA/pafs_core/pull/294) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-551\] Add PFC 2020 v1 [\#292](https://github.com/DEFRA/pafs_core/pull/292) ([MattHallEA](https://github.com/MattHallEA))
+- Integration for 2.3 deployment [\#289](https://github.com/DEFRA/pafs_core/pull/289) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-567\] Add json schema [\#288](https://github.com/DEFRA/pafs_core/pull/288) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-568\] Add defaults to PFC mapper [\#287](https://github.com/DEFRA/pafs_core/pull/287) ([MattHallEA](https://github.com/MattHallEA))
+- Update secure\_headers requirement from ~\> 3.6 to \>= 3.6, \< 7.0 [\#286](https://github.com/DEFRA/pafs_core/pull/286) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[PM-565\] Upgrade postgres to 9.5 in travis [\#285](https://github.com/DEFRA/pafs_core/pull/285) ([MattHallEA](https://github.com/MattHallEA))
+- \[NO-JIRA\] Fix bundler version used by travis [\#284](https://github.com/DEFRA/pafs_core/pull/284) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-556\] Add migration for controlled lists [\#283](https://github.com/DEFRA/pafs_core/pull/283) ([MattHallEA](https://github.com/MattHallEA))
+- Bump rack from 1.6.11 to 1.6.12 [\#282](https://github.com/DEFRA/pafs_core/pull/282) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rack-cors from 1.0.3 to 1.0.6 [\#281](https://github.com/DEFRA/pafs_core/pull/281) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \[PM-558\] Improve go to AIMS wording for new projects [\#280](https://github.com/DEFRA/pafs_core/pull/280) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-554\] Add class to send an Archived message to PoL [\#279](https://github.com/DEFRA/pafs_core/pull/279) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-555\] Fix for exception when validating no values when 'project does not reduce the risk of coastal erosion' box is ticked [\#278](https://github.com/DEFRA/pafs_core/pull/278) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-546\] Allow imports to specify the project status [\#277](https://github.com/DEFRA/pafs_core/pull/277) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-548\] Correct partnetship funding xls mapping [\#276](https://github.com/DEFRA/pafs_core/pull/276) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-539\] Change `long_time_loss` to `long_term_loss` [\#274](https://github.com/DEFRA/pafs_core/pull/274) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-526\] Remove revert to draft button and fix edit capabilities [\#273](https://github.com/DEFRA/pafs_core/pull/273) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-529\] Remove approval process for RMAs [\#271](https://github.com/DEFRA/pafs_core/pull/271) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-528\] Add brackets to Great Ouse [\#270](https://github.com/DEFRA/pafs_core/pull/270) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-528\] Anglian Central =\> Anglian Great Ouse [\#269](https://github.com/DEFRA/pafs_core/pull/269) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-451\] Submission to PoL [\#268](https://github.com/DEFRA/pafs_core/pull/268) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-522\] Add export script to send projects to PoL [\#267](https://github.com/DEFRA/pafs_core/pull/267) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-451\] Add submitted to pol scope [\#266](https://github.com/DEFRA/pafs_core/pull/266) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-505\] Change JSON payload to match schema post funding journey change [\#265](https://github.com/DEFRA/pafs_core/pull/265) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-482\] Record datetime of successful submission to PoL [\#263](https://github.com/DEFRA/pafs_core/pull/263) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-473\] Add Azure vault oauth and secret classes [\#262](https://github.com/DEFRA/pafs_core/pull/262) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-483\] Update create new proposal wording [\#261](https://github.com/DEFRA/pafs_core/pull/261) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-357\] Submitting a project sends it to PoL [\#260](https://github.com/DEFRA/pafs_core/pull/260) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-436\] Move proposal creation to new env var [\#259](https://github.com/DEFRA/pafs_core/pull/259) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-334\] Add shapefile to JSON [\#258](https://github.com/DEFRA/pafs_core/pull/258) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-434\] Remove spurious OM key in JSON [\#257](https://github.com/DEFRA/pafs_core/pull/257) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-435\] Add national grid reference to JSON [\#256](https://github.com/DEFRA/pafs_core/pull/256) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-433\] Change Health & Safety -\> Health and Safety [\#255](https://github.com/DEFRA/pafs_core/pull/255) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-377\] Change PSO restriction to scope to area project is in [\#254](https://github.com/DEFRA/pafs_core/pull/254) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-399\] Fix state factory and allow projects to be created with state traits [\#253](https://github.com/DEFRA/pafs_core/pull/253) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-399\] Fix and refactor Area factories [\#252](https://github.com/DEFRA/pafs_core/pull/252) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-377\] Remove spurious header [\#251](https://github.com/DEFRA/pafs_core/pull/251) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-437\] Change the status buttons to refer PSO users to PoL [\#250](https://github.com/DEFRA/pafs_core/pull/250) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-436\] Add wording to refer PSO's to PoL [\#249](https://github.com/DEFRA/pafs_core/pull/249) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-399\] Add guard and reduce Faraday logging [\#248](https://github.com/DEFRA/pafs_core/pull/248) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-377\] Remove PSO project edit and create [\#247](https://github.com/DEFRA/pafs_core/pull/247) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-431\] Moderation code Other -\> Emergency [\#244](https://github.com/DEFRA/pafs_core/pull/244) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-412\] Add creator email to JSON [\#243](https://github.com/DEFRA/pafs_core/pull/243) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-395\] Correct OM4 values in JSON output [\#242](https://github.com/DEFRA/pafs_core/pull/242) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-396\] Add whole life benefits to JSON [\#241](https://github.com/DEFRA/pafs_core/pull/241) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-405\] Add urgency details to CAMC3 Presenter [\#240](https://github.com/DEFRA/pafs_core/pull/240) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-404\] Mod code should be 'Not Urgent' in JSON [\#239](https://github.com/DEFRA/pafs_core/pull/239) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-343\] Correct dropdown in rows KH-KJ [\#238](https://github.com/DEFRA/pafs_core/pull/238) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-366\] Fix data duplication on state change [\#237](https://github.com/DEFRA/pafs_core/pull/237) ([MattHallEA](https://github.com/MattHallEA))
+- \[NO-JIRA\] Move from FactoryGirl to FactoryBot [\#236](https://github.com/DEFRA/pafs_core/pull/236) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-343\] Update FCERM1 spreadsheet [\#235](https://github.com/DEFRA/pafs_core/pull/235) ([MattHallEA](https://github.com/MattHallEA))
+- \[NO-JIRA\] Update gems to resolve CVE-2019-11068 [\#234](https://github.com/DEFRA/pafs_core/pull/234) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-384\] Refactor project state and add factory [\#233](https://github.com/DEFRA/pafs_core/pull/233) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-384\] Refactor projects controller spec [\#232](https://github.com/DEFRA/pafs_core/pull/232) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-368\] Fix for sort direction UI [\#231](https://github.com/DEFRA/pafs_core/pull/231) ([MattHallEA](https://github.com/MattHallEA))
+- \[PM-384\] Fix zero projects crashing the all projects page [\#230](https://github.com/DEFRA/pafs_core/pull/230) ([MattHallEA](https://github.com/MattHallEA))
+- Extract funding sources and their associated values [\#228](https://github.com/DEFRA/pafs_core/pull/228) ([baphled](https://github.com/baphled))
+- Fix tests that now break as we're in a new tax year. [\#227](https://github.com/DEFRA/pafs_core/pull/227) ([baphled](https://github.com/baphled))
+- Update data extraction for CAMC3 [\#226](https://github.com/DEFRA/pafs_core/pull/226) ([baphled](https://github.com/baphled))
+- Bugfix/resolve risk and household benefits issue [\#225](https://github.com/DEFRA/pafs_core/pull/225) ([baphled](https://github.com/baphled))
+- Update Rails to 4.2.11.1 to rsolve the following CVE reports: [\#224](https://github.com/DEFRA/pafs_core/pull/224) ([baphled](https://github.com/baphled))
+- Integrate remaining fcerm1 data extract [\#223](https://github.com/DEFRA/pafs_core/pull/223) ([baphled](https://github.com/baphled))
+- Make sure that we handle the PF calculator file properly [\#222](https://github.com/DEFRA/pafs_core/pull/222) ([baphled](https://github.com/baphled))
+- Integrate PF Calculator extraction. [\#221](https://github.com/DEFRA/pafs_core/pull/221) ([baphled](https://github.com/baphled))
+- Extract PF Calculator data for CAMC3 [\#220](https://github.com/DEFRA/pafs_core/pull/220) ([baphled](https://github.com/baphled))
+- Allow CAMC3 client to extract data from the FCERM1 OM2 & OM3 data sets [\#219](https://github.com/DEFRA/pafs_core/pull/219) ([baphled](https://github.com/baphled))
+- Add initial presenter class for managing CACM3 related data mapping. [\#218](https://github.com/DEFRA/pafs_core/pull/218) ([baphled](https://github.com/baphled))
+- Remove sort by on created by [\#217](https://github.com/DEFRA/pafs_core/pull/217) ([baphled](https://github.com/baphled))
+- Make sure that only PSO users can order by "Created by" [\#216](https://github.com/DEFRA/pafs_core/pull/216) ([baphled](https://github.com/baphled))
+- Fix typo [\#215](https://github.com/DEFRA/pafs_core/pull/215) ([baphled](https://github.com/baphled))
+- Resolve issue when sort order has not been defined [\#214](https://github.com/DEFRA/pafs_core/pull/214) ([baphled](https://github.com/baphled))
+- Security updates [\#213](https://github.com/DEFRA/pafs_core/pull/213) ([baphled](https://github.com/baphled))
+- Allow users to sort by "Created By". [\#211](https://github.com/DEFRA/pafs_core/pull/211) ([baphled](https://github.com/baphled))
+- Patch/security updates [\#210](https://github.com/DEFRA/pafs_core/pull/210) ([baphled](https://github.com/baphled))
+- Update Engine to re-use factories [\#209](https://github.com/DEFRA/pafs_core/pull/209) ([baphled](https://github.com/baphled))
+- Update rubyzip to resolve \[CVE-2018-1000544\] [\#208](https://github.com/DEFRA/pafs_core/pull/208) ([baphled](https://github.com/baphled))
+- \[PK-1057\] Allow a batch of PF calculators to be downloaded [\#206](https://github.com/DEFRA/pafs_core/pull/206) ([baphled](https://github.com/baphled))
+- \[PK-1065\] Make sure that proposals with completed are calculated as proposals over [\#205](https://github.com/DEFRA/pafs_core/pull/205) ([baphled](https://github.com/baphled))
+- \[PK-1046\] Tweak functionality so that we don't assume that we have proposals with each status [\#204](https://github.com/DEFRA/pafs_core/pull/204) ([baphled](https://github.com/baphled))
+- \[PK-1046\] Provide a summary of the proposal statuses within a programme download [\#203](https://github.com/DEFRA/pafs_core/pull/203) ([baphled](https://github.com/baphled))
+- \[PK-1059\] fcrm1 status to reflect actual pafs status [\#202](https://github.com/DEFRA/pafs_core/pull/202) ([baphled](https://github.com/baphled))
+- \[PK-1048\] Update FCRM1 to include a filter for a project's status [\#201](https://github.com/DEFRA/pafs_core/pull/201) ([baphled](https://github.com/baphled))
+- \[PK-1043\] Make sure that a user can add a date when the proposal is not archived [\#200](https://github.com/DEFRA/pafs_core/pull/200) ([baphled](https://github.com/baphled))
+- Make sure that a user can not change dates when a proposal is archived [\#199](https://github.com/DEFRA/pafs_core/pull/199) ([baphled](https://github.com/baphled))
+- Show all project proposals [\#198](https://github.com/DEFRA/pafs_core/pull/198) ([baphled](https://github.com/baphled))
+- \[PK-1043\] archive proposals for RMA & PSO [\#197](https://github.com/DEFRA/pafs_core/pull/197) ([baphled](https://github.com/baphled))
+- \[PK-1043\] archive proposals for RMA & PSO [\#196](https://github.com/DEFRA/pafs_core/pull/196) ([baphled](https://github.com/baphled))
+- Resolve issue where RMA users could not archive proposals [\#195](https://github.com/DEFRA/pafs_core/pull/195) ([baphled](https://github.com/baphled))
+- \[PK-1043\] Archive proposals for RMA & PSO [\#194](https://github.com/DEFRA/pafs_core/pull/194) ([baphled](https://github.com/baphled))
+- \[PK-970\] area programming staff download draft status projects [\#193](https://github.com/DEFRA/pafs_core/pull/193) ([baphled](https://github.com/baphled))
+- Pk 1045 allow users to assign PSO area [\#192](https://github.com/DEFRA/pafs_core/pull/192) ([baphled](https://github.com/baphled))
+- Make sure we order an user area by it's primary setting [\#191](https://github.com/DEFRA/pafs_core/pull/191) ([baphled](https://github.com/baphled))
+- \[PK-1045\] Allow users with more than 1 PSO area to set a project area [\#190](https://github.com/DEFRA/pafs_core/pull/190) ([baphled](https://github.com/baphled))
+- \[PK-1026\] Remove the filter/sort arrows from the list of projects table [\#187](https://github.com/DEFRA/pafs_core/pull/187) ([baphled](https://github.com/baphled))
+- \[PK-1031\] Amend the language on on protect or improve surface water [\#186](https://github.com/DEFRA/pafs_core/pull/186) ([baphled](https://github.com/baphled))
+- Make sure that users are sent back to the section they just saved [\#185](https://github.com/DEFRA/pafs_core/pull/185) ([baphled](https://github.com/baphled))
+- \[PK-966\] What happens when the user goes back to the summary page after completing a section [\#184](https://github.com/DEFRA/pafs_core/pull/184) ([baphled](https://github.com/baphled))
+- \[PK-1018\] I need to find an individual record by partial project name or number [\#183](https://github.com/DEFRA/pafs_core/pull/183) ([baphled](https://github.com/baphled))
+- \[PK-931\] - Amend service validation [\#182](https://github.com/DEFRA/pafs_core/pull/182) ([baphled](https://github.com/baphled))
+- Update validation of flood and coastal erosion protection forms so that [\#181](https://github.com/DEFRA/pafs_core/pull/181) ([baphled](https://github.com/baphled))
+- \[PK-931\] Amend service validation to allow projects that don't protect households [\#180](https://github.com/DEFRA/pafs_core/pull/180) ([baphled](https://github.com/baphled))
+- \[PK-965\] Revert important dates [\#179](https://github.com/DEFRA/pafs_core/pull/179) ([baphled](https://github.com/baphled))
+- \[PK-884\] - Rewrite project types [\#178](https://github.com/DEFRA/pafs_core/pull/178) ([baphled](https://github.com/baphled))
+- Update FCERM template to resolve issue with Excel's name manager [\#177](https://github.com/DEFRA/pafs_core/pull/177) ([baphled](https://github.com/baphled))
+- \[PK-1023\] missing formulae for BL-BX [\#176](https://github.com/DEFRA/pafs_core/pull/176) ([baphled](https://github.com/baphled))
+- \[PK-1022\] OM4b missing formula [\#175](https://github.com/DEFRA/pafs_core/pull/175) ([baphled](https://github.com/baphled))
+- \[PK-962\] Add a fullstop the end of the error message. [\#174](https://github.com/DEFRA/pafs_core/pull/174) ([baphled](https://github.com/baphled))
+- Refactor so that we don't check validation when rendering the funding source [\#173](https://github.com/DEFRA/pafs_core/pull/173) ([baphled](https://github.com/baphled))
+- Pk 962 validate pf calculator [\#172](https://github.com/DEFRA/pafs_core/pull/172) ([baphled](https://github.com/baphled))
+- \[PK-954 amend environmental outcome wording to better reflect the language used by defra [\#171](https://github.com/DEFRA/pafs_core/pull/171) ([baphled](https://github.com/baphled))
+- \[PK-972\] Amend the request account page to include access needed [\#170](https://github.com/DEFRA/pafs_core/pull/170) ([baphled](https://github.com/baphled))
+- \[PK-910\] - 'Expected' Environment Agency sources [\#169](https://github.com/DEFRA/pafs_core/pull/169) ([baphled](https://github.com/baphled))
+- Pk 976 amend fcerm1 [\#168](https://github.com/DEFRA/pafs_core/pull/168) ([baphled](https://github.com/baphled))
+- Security updates [\#167](https://github.com/DEFRA/pafs_core/pull/167) ([baphled](https://github.com/baphled))
+- \[PK-962\] validate Partnership Funding Calculator [\#166](https://github.com/DEFRA/pafs_core/pull/166) ([baphled](https://github.com/baphled))
+- Fix offset for PFCalc OM4 fields [\#165](https://github.com/DEFRA/pafs_core/pull/165) ([tonyheadford](https://github.com/tonyheadford))
+- Added find method for program uploads [\#164](https://github.com/DEFRA/pafs_core/pull/164) ([tonyheadford](https://github.com/tonyheadford))
+- Wrapped jobs with AR connection pool block [\#163](https://github.com/DEFRA/pafs_core/pull/163) ([tonyheadford](https://github.com/tonyheadford))
+- Moved area programming generation into ActiveJob [\#162](https://github.com/DEFRA/pafs_core/pull/162) ([tonyheadford](https://github.com/tonyheadford))
+- Apply spreadsheet hack to fill in 'missing' formula [\#161](https://github.com/DEFRA/pafs_core/pull/161) ([tonyheadford](https://github.com/tonyheadford))
+- Fixes for rma name in export and multiple areas in import [\#160](https://github.com/DEFRA/pafs_core/pull/160) ([tonyheadford](https://github.com/tonyheadford))
+- Fixed multi project FCERM1 export \(PM-297\) and downloads issue [\#159](https://github.com/DEFRA/pafs_core/pull/159) ([tonyheadford](https://github.com/tonyheadford))
+- Added reset consented flag to programme import [\#158](https://github.com/DEFRA/pafs_core/pull/158) ([tonyheadford](https://github.com/tonyheadford))
+- Updated text to reflect APT access [\#157](https://github.com/DEFRA/pafs_core/pull/157) ([tonyheadford](https://github.com/tonyheadford))
+- Fixed issue with outputting OM2/3 values \(PM-48\) [\#156](https://github.com/DEFRA/pafs_core/pull/156) ([tonyheadford](https://github.com/tonyheadford))
+- Prevent cookie issues with asite controller [\#155](https://github.com/DEFRA/pafs_core/pull/155) ([tonyheadford](https://github.com/tonyheadford))
+- Removed turbolinks [\#154](https://github.com/DEFRA/pafs_core/pull/154) ([tonyheadford](https://github.com/tonyheadford))
+- Updated regex to facilitate unusual reference numbers [\#153](https://github.com/DEFRA/pafs_core/pull/153) ([tonyheadford](https://github.com/tonyheadford))
+- Removed gia and LL pages from bootstrap \(PM-274\) [\#152](https://github.com/DEFRA/pafs_core/pull/152) ([tonyheadford](https://github.com/tonyheadford))
+- Fixed issue with reg\_ex and layout [\#151](https://github.com/DEFRA/pafs_core/pull/151) ([tonyheadford](https://github.com/tonyheadford))
+- Changed program to programme in table [\#150](https://github.com/DEFRA/pafs_core/pull/150) ([tonyheadford](https://github.com/tonyheadford))
+- Changes in preparation for programme refresh statuses [\#149](https://github.com/DEFRA/pafs_core/pull/149) ([tonyheadford](https://github.com/tonyheadford))
+- Fixed issue with numeric grid ref and widened reference number regex [\#148](https://github.com/DEFRA/pafs_core/pull/148) ([tonyheadford](https://github.com/tonyheadford))
+- Added consented flag to project [\#146](https://github.com/DEFRA/pafs_core/pull/146) ([tonyheadford](https://github.com/tonyheadford))
+- Sort formatting [\#145](https://github.com/DEFRA/pafs_core/pull/145) ([nigejohnson](https://github.com/nigejohnson))
+- Added program upload functionality [\#144](https://github.com/DEFRA/pafs_core/pull/144) ([tonyheadford](https://github.com/tonyheadford))
+- Add ability 2 generate file with multiple projects [\#130](https://github.com/DEFRA/pafs_core/pull/130) ([Cruikshanks](https://github.com/Cruikshanks))
 
-## [v1.0](https://github.com/defra/pafs_core/tree/v1.0) (2017-03-24)
+## [v1.0](https://github.com/DEFRA/pafs_core/tree/v1.0) (2017-03-24)
 
-[Full Changelog](https://github.com/defra/pafs_core/compare/05e323caabf387d6658b6de6d2a685260bb5eff7...v1.0)
+[Full Changelog](https://github.com/DEFRA/pafs_core/compare/05e323caabf387d6658b6de6d2a685260bb5eff7...v1.0)
 
 **Merged pull requests:**
 
@@ -302,6 +608,42 @@
 - Added maps to summary [\#39](https://github.com/DEFRA/pafs_core/pull/39) ([tonyheadford](https://github.com/tonyheadford))
 - Fixed issues with risks and layout [\#38](https://github.com/DEFRA/pafs_core/pull/38) ([tonyheadford](https://github.com/tonyheadford))
 - Fixed typo in step name [\#37](https://github.com/DEFRA/pafs_core/pull/37) ([tonyheadford](https://github.com/tonyheadford))
+- Hooked up the changes to the important date pages [\#36](https://github.com/DEFRA/pafs_core/pull/36) ([tonyheadford](https://github.com/tonyheadford))
+- Feature/summary [\#35](https://github.com/DEFRA/pafs_core/pull/35) ([tonyheadford](https://github.com/tonyheadford))
+- updated standard of protection section [\#34](https://github.com/DEFRA/pafs_core/pull/34) ([kennyevil](https://github.com/kennyevil))
+- updated dummy app [\#33](https://github.com/DEFRA/pafs_core/pull/33) ([kennyevil](https://github.com/kennyevil))
+- updated rails [\#32](https://github.com/DEFRA/pafs_core/pull/32) ([kennyevil](https://github.com/kennyevil))
+- Add submitted page [\#31](https://github.com/DEFRA/pafs_core/pull/31) ([kennyevil](https://github.com/kennyevil))
+- added sea flooding option [\#30](https://github.com/DEFRA/pafs_core/pull/30) ([kennyevil](https://github.com/kennyevil))
+- updated errors for funding values step [\#29](https://github.com/DEFRA/pafs_core/pull/29) ([kennyevil](https://github.com/kennyevil))
+- seperated out the key dates pages [\#28](https://github.com/DEFRA/pafs_core/pull/28) ([kennyevil](https://github.com/kennyevil))
+- Content changes [\#27](https://github.com/DEFRA/pafs_core/pull/27) ([kennyevil](https://github.com/kennyevil))
+- Mapping [\#26](https://github.com/DEFRA/pafs_core/pull/26) ([kennyevil](https://github.com/kennyevil))
+- Changed error message for funding sources \(PK-648\) [\#25](https://github.com/DEFRA/pafs_core/pull/25) ([tonyheadford](https://github.com/tonyheadford))
+- Updated content for funding\_sources [\#24](https://github.com/DEFRA/pafs_core/pull/24) ([tonyheadford](https://github.com/tonyheadford))
+- Updates to Project Type page \(PK-236\) [\#23](https://github.com/DEFRA/pafs_core/pull/23) ([tonyheadford](https://github.com/tonyheadford))
+- Updated error messages \(PK-625\) [\#22](https://github.com/DEFRA/pafs_core/pull/22) ([tonyheadford](https://github.com/tonyheadford))
+- Fixes for risk section nav issues \(PK-663, PK-665, PK-666\) [\#21](https://github.com/DEFRA/pafs_core/pull/21) ([tonyheadford](https://github.com/tonyheadford))
+- Additional pages for the individual funding contributors [\#20](https://github.com/DEFRA/pafs_core/pull/20) ([tonyheadford](https://github.com/tonyheadford))
+- Fixed date format for six year window date \(PK-404, PK-403\) [\#19](https://github.com/DEFRA/pafs_core/pull/19) ([tonyheadford](https://github.com/tonyheadford))
+- Made error description optional in form builder [\#18](https://github.com/DEFRA/pafs_core/pull/18) ([tonyheadford](https://github.com/tonyheadford))
+- Added visited flag for funding\_sources step [\#17](https://github.com/DEFRA/pafs_core/pull/17) ([tonyheadford](https://github.com/tonyheadford))
+- Set navigation to enable steps sequentially \(PK-554\) [\#16](https://github.com/DEFRA/pafs_core/pull/16) ([tonyheadford](https://github.com/tonyheadford))
+- updated financial year pages [\#15](https://github.com/DEFRA/pafs_core/pull/15) ([kennyevil](https://github.com/kennyevil))
+- Fixed logic issue in wfd pages \(PK-635\) [\#14](https://github.com/DEFRA/pafs_core/pull/14) ([tonyheadford](https://github.com/tonyheadford))
+- Added funding calculator summary page after upload of file and chenged default pfc page if file already uploaded [\#13](https://github.com/DEFRA/pafs_core/pull/13) ([tonyheadford](https://github.com/tonyheadford))
+- skip risks section if households not protected [\#12](https://github.com/DEFRA/pafs_core/pull/12) ([kennyevil](https://github.com/kennyevil))
+- fixed household risks and changed project type page [\#11](https://github.com/DEFRA/pafs_core/pull/11) ([kennyevil](https://github.com/kennyevil))
+- Updated earliest start pages with new text \(PK-203, PK-256\) [\#10](https://github.com/DEFRA/pafs_core/pull/10) ([tonyheadford](https://github.com/tonyheadford))
+- Added initial questions create project \(PK-404, PK-621, PK-403\) [\#9](https://github.com/DEFRA/pafs_core/pull/9) ([tonyheadford](https://github.com/tonyheadford))
+- changed validation [\#8](https://github.com/DEFRA/pafs_core/pull/8) ([kennyevil](https://github.com/kennyevil))
+- fixed issues from qa testing [\#7](https://github.com/DEFRA/pafs_core/pull/7) ([kennyevil](https://github.com/kennyevil))
+- Household risks [\#6](https://github.com/DEFRA/pafs_core/pull/6) ([kennyevil](https://github.com/kennyevil))
+- added invitable fields to pafs\_core user model [\#5](https://github.com/DEFRA/pafs_core/pull/5) ([kennyevil](https://github.com/kennyevil))
+- moved user model to pafs\_core [\#4](https://github.com/DEFRA/pafs_core/pull/4) ([kennyevil](https://github.com/kennyevil))
+- Modify area importer [\#3](https://github.com/DEFRA/pafs_core/pull/3) ([kennyevil](https://github.com/kennyevil))
+- Recursive search for projects [\#2](https://github.com/DEFRA/pafs_core/pull/2) ([kennyevil](https://github.com/kennyevil))
+- added area model [\#1](https://github.com/DEFRA/pafs_core/pull/1) ([kennyevil](https://github.com/kennyevil))