Almost done..need isnumeric fix