Unfortunately a slightly large initial commit, due to it being quite a
bit of work to unpick it all.