There's too much stuff here to quickly review, it'd be nice if you
could split this up into patches that do the following:

Thanks, I will send out a v2 with the split you suggested.