Forms

There's more work to do on forms, but this should get us started.