Add to TODO
Fix a bug with the -R arguments