Reorganize the survey classes for better context
Store the actual submitted data earlier in the process
Update survey processing to be more explicit
Finalize implementation (one time token still missing)
Small fix for the contact information