Refactoring back to basics.
More rebasing.