Switch from CLI to config based setup.  Other changes.
Switch from CLI to config based setup.  Other changes.