#32 started to implement better form validation