Merging in code from other project.