Gear the example more towards a CLI application