Move form data to struct.... WIP... no compile