Started moving Form submit to the form and functions files

Site still broken