- Drastically improved the regex process, it is now way more generic