Added command line option support in anticipation of deletion functionality.