Prepare for the rest of the options.
Added TODO: make arguments consistent.
I think this finally connects the CLI client to Santiago :)
Made interactive testing a little easier.