Revise to get the basic modes working for the CLI