Added regex, still needs more work.