WIP regex
unit/integration tests pass