Added in some form validation, need to start submitting data again soon