Merge pulling in their changes.  Will address my changes in later commit