Update CLI command handling

[oubiwann]

Tasks:

• Update the command handler to take the new types as args
• Do a better job of taking defaults from the flags when data is not provided in args
• Standardise on a convention for pulling out slice elements by "name"
• Get CLI commands / args working again