More partial work on forms.