Changes to regex handling to allow for leads (still need to implement an RE algorithm, though