Original messages now use hard coded regexs

* Next step is to make these configurable