Added in basic form validation