Added some config options
Started with the match