Getting ready to pull Dan's changes.
Fixing merge conflicts.