Started adding form validation