Adding regular expressions, Changing how they are accessed and fixing tests.