Add some logic for replacing things in the output.
Add regex search