form stuff
Merge pull request #6 from bchiatt/matt

form stuff