split out form data into form collection
comment out some code
oops
remove some code
tidy
Merge branch 'betterform'