Major rewrite of commands to use rsync instead