WIP - adding regex