Working mail form

- mail form test passing

Notice size of commit and number of files changed. This is a much larger
commit then I would like!