More unit tests. Need implementations.
Got a couple more unit tests implemented.
Refactor to use regex terminology for capture groups.