Removed previous implementation, updated some tests and added labelled
replacements.