Indeed.
I'll have to put all this on hold until time again (may be as long as in few weeks).

In the unlikely case someone is in a hurry to see merged, or irrevocably rejected, should feel free to edit further.