More work on forms.  Image upload mostly working.