[work-in-progress] Create a form fieldset to make easier to validate and persist