in progress - regex + tests