Done with our work on our CLI code (closes #199).