Merging in the last of the changes from the old work area.