Closes #1 / Add 's/this/that' type substituting