A little refactoring.
WIP.
Implement.
Cleanup.
Cleanup.
Update docs.
Cleanup.
Merge pull request #1 from remind101/branch-default

Branch default