Use an ICommand-based approach.

This makes both the code more readable and the user interface more stable.

Still need to convert the test runner code, heading out to watch the
World Cup Game now ...