I rebased and added a few additional patches.