First cut of reworked forms.