OK, when you put it that way I see. 
Working on the split now...
This is forcing me to learn git rebase :-)