I've broken up the patch to make it more easily reviewed, and deal with potential rebase conflicts more easily