Description of problem: Merge all files, note anything important, open bugs for unmigrated but required features.