Merging in all the pieces from previous versions.