Remove isNumeric checks, need a better validator