Working with class based regexes
Add implementation of remaining substitutions that are populated
Add a few additional command line options