Merge quickbook. Starting 1.6 alpha, plus some 1.7 development.