About to try centralized replace technique.
Merging in some changes from try branch.
.
.
.
.
.