Add functions from martin.
Strip the line for match to happen.
Add functions with single output