Move some more selection call functions into the private scope.
Add the ability to git merge.