Started retooling code toward a command-line interface.