Need to restructure at this point.
regex updated