Working on some regex changes
UNFINISHED