WIP.  HA Swift.  rsync refactor.

Do not merge (yet).