Devel

Pulling the string rationalisation edits into master.