more work towards multiple forms

I'm putting this as a commit even though it's not done because I may
want to come back to this but I think it will be quicker to simply
hard-code a new form rather make it fully editable.