Merge in the new stuff