#32 Re-add validation on JS-side of the new