Regex: WIP
New regex
Revert 79ec982..aa737cf

This rolls back to commit 79ec9824bdd1bb3d87ac6326436f4cf01b82ce2f.
Back on track