Finish switch over to CLI.
3 files changed