Max&Sam: Split generic form logic from the rp2 form.
Merge pull request #339 from InsolvencyService/split-generic-form

Max&Sam: Split generic form logic from the rp2 form.