Started working on a more effective form-validator