Re-factor to actually deal with the FormSubmission entity.