There is more work to be done yes. More commits are coming. I personally not sure I like this mode of operation with these PR's and these multiple commits in it, etc. You know what, just close this one down, and I'll do a new one when I think it's more or less complete.