Bring in tons of preliminary changes for the new version.