WIP.  HA Swift.  rsync refactor