diff --git a/.gitreview b/.gitreview
index dba8a92..43c7604 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=voltctl.git
 defaultremote=origin
+defaultbranch=voltha-2.3
diff --git a/README.md b/README.md
index 8b732ff..91293be 100644
--- a/README.md
+++ b/README.md
@@ -1,140 +1,170 @@
-[![License](https://img.shields.io/github/license/opencord/voltctl.svg)](https://github.com/opencord/voltctl/blob/master/LICENSE.md)[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://gitHub.com/opencord/voltctl/graphs/commit-activity) [![made-with-python](https://img.shields.io/badge/Made%20with-Go-1f425f.svg)](https://www.golang.org/) [![GitHub contributors](https://img.shields.io/github/contributors/opencord/voltctl.svg)](https://gitHub.com/opencord/voltctl/graphs/contributors/) [![GitHub issues](https://img.shields.io/github/issues/opencord/voltctl.svg)](https://gitHub.com/opencord/voltctl/issues/) [![GitHub issues-closed](https://img.shields.io/github/issues-closed/opencord/voltctl.svg)](https://gitHub.com/opencord/voltctl/issues?q=is%3Aissue+is%3Aclosed) [![Last Commit](https://img.shields.io/github/last-commit/opencord/voltctl.svg)](https://github.com/opencord/voltctl/commits/master)
+# voltctl, a CLI for VOLTHA
 
-# `voltctl` - A command line tools to access VOLTHA
-In today's VOLTHA implementation the operator interacts with VOLTHA via a CLI
-that is accessed by `SSH`ing to the VOLTHA tool. While is can be convenent as
-it requires not external tool to be installed it is an abirtation in terms of
-industry trends for tools such as `docker` and `kubernetes`, which are both
-tools that VOLTHA leverages.
+This repository contains `voltctl`, a CLI tool for managing and operating
+VOLTHA components.
 
-This repository contains a tool that attempts to provide a use model for
-VOLTHA that is similar to that of `docker` and `kubernetes` in that a simple
-control application is provided to invoke various funcs and the output can
-be displayed as a customized/filtered table or as `JSON`.
+It functions similarly to the `docker` CLI or kubernetes `kubectl` CLI, in that
+it's a simple standalone control application which can perform various
+functions and has flexible and customizable output formats either as a table or
+`JSON`.
 
 ## Build / Install
-To install the `voltctl` command you can use the following:
-```bash
-mkdir myworkdir
-cd myworkdir
-export GOPATH=$(pwd)
-git clone https://gerrit.opencord.org/voltctl src/github.com/opencord/voltctl
-cd src/github.com/opencord/voltctl
-make build
-cp ./voltctl <to any place you want in your path>
-```
 
-`voltctl` has only been tested with `go` version 1.12.x.
+To install the `voltctl` command, downloads are available for multiple
+platforms and architectures from the [github releases
+page](https://github.com/opencord/voltctl/releases), or you can compile your
+own copy by installing Go 1.13.x, checking out the code and running `make
+build`.
 
 ## Shell Completion
-`voltctl` supports shell completion for the `bash` shell. To enable
-shell Completion you can use the following command on *most* \*nix based system.
-```bash
+
+`voltctl` supports shell completion for the `bash` shell. To enable shell
+Completion you can use the following command on *most* \*nix based system.
+
+```shell
 source <(voltctl completion bash)
 ```
 
-If this does not work on your system, as is the case with the standard
-bash shell on MacOS, then you can try the following command:
-```bash
+If you are running an older bash 3.x shell (default on MacOS), then you can try
+the following command:
+
+```shell
 source /dev/stdin <<<"$(voltctl completion bash)"
 ```
 
-If you which to make `bash` shell completion automatic when you login to
-your account you can append the output of `voltctl completion bash` to
-your `$HOME/.bashrc`:
-```bash
+If you which to make `bash` shell completion automatic when you login to your
+account you can append the output of `voltctl completion bash` to your
+`$HOME/.bashrc`:
+
+```shell
 voltctl completion base >> $HOME/.bashrc
 ```
 
-## Configuration
-Currently the configuration only supports the specification of the VOLTHA
-server. There is a sample configuration file name `voltctl.config`. You can
-copy this to `~/.volt/config` and modify the server parameter to your
-environment. Alternatively you can specify the server on the command line as
-well, `voltctl -server host:port ...`.
+## Configuration file
 
-## Commands
-Currently only two commands are working
-- `voltctl adapter list` - displays the installed adapters
-- `voltctl device list` - displays the devices in the system
-- `voltctl device create [-t type] [-i ipv4] [-m mac] [-H host_and_port]` -
-  create or pre-provision a device
-- `voltctl delete DEVICE_ID [DEVICE_ID...]` - delete one or more devices
-- `voltctl enable DEVICE_ID [DEVICE_ID...]` - enable one or more devices
-- `voltctl disable DEVICE_ID [DEVICE_ID...]` - disable one or more devices
-- `voltctl version` - display the client and server version
+`voltctl` stores it's configuration file in `~/.volt/config`. An example of the
+configuration file can be found in the `voltctl.config` file in this repo.
 
-## Output Format
-Each command has a default output table format. This can be overriden from
-the command line using the `voltctl --format=...` option. The specification
-of the format is roughly equivalent to the `docker` or `kubectl` command. If
-the prefix `table` is specified a table with headers will be displayed, else
-each line will be output as specified.
+## Usage and Commands
+
+```shell
+$ ./voltctl -h
+Usage:
+  voltctl [OPTIONS] <command>
+
+Global Options:
+  -c, --config=FILE                     Location of client config file [$VOLTCONFIG]
+  -s, --server=SERVER:PORT              IP/Host and port of VOLTHA
+  -k, --kafka=SERVER:PORT               IP/Host and port of Kafka
+  -e, --kvstore=SERVER:PORT             IP/Host and port of KV store (etcd) [$KVSTORE]
+  -a, --apiversion=VERSION[v1|v2|v3]    API version
+  -d, --debug                           Enable debug mode
+  -t, --timeout=DURATION                API call timeout duration
+      --tls                             Use TLS
+      --tlscacert=CA_CERT_FILE          Trust certs signed only by this CA
+      --tlscert=CERT_FILE               Path to TLS vertificate file
+      --tlskey=KEY_FILE                 Path to TLS key file
+      --tlsverify                       Use TLS and verify the remote
+  -8, --k8sconfig=FILE                  Location of Kubernetes config file [$KUBECONFIG]
+      --kvstoretimeout=DURATION         timeout for calls to KV store [$KVSTORE_TIMEOUT]
+  -o, --command-options=FILE            Location of command options default configuration file [$VOLTCTL_COMMAND_OPTIONS]
+
+Help Options:
+  -h, --help                            Show this help message
+
+Available commands:
+  adapter        adapter commands
+  completion     generate shell compleition
+  component      component instance commands
+  config         generate voltctl configuration
+  device         device commands
+  devicegroup    device group commands
+  event          event commands
+  logicaldevice  logical device commands
+  loglevel       loglevel commands
+  version        display version
+```
+
+Help specific to each command can be found by running `volctl <command> -h`.
+
+### Changing the command output format
+
+Each command has a default output table format. This can be overridden from the
+command line using the `voltctl --format=...` option. The specification of the
+format is roughly equivalent to the `docker` or `kubectl` command. If the
+prefix `table` is specified a table with headers will be displayed, else each
+line will be output as specified.
 
 The output of a command may also be written as `JSON` or `YAML` by using the
 `--outputas` or `-o` command line option. Valid values for this options are
 `table`, `json`, or `yaml`.
 
-## Overriding Default Command Format and Order
-The default format and ordering of commands can be overriden (specified) by
+### Overriding Default Command Format and Order
+
+The default format and ordering of commands can be overridden (specified) by
 the command line options, but they can also be set via a configuration file so
-that the overrides don't have to be specified on each invocation. By default
-the file `~/.volt/command_options` is loaded, but the file used can also be
-specified by the environment variable `VOLTCTL_COMMAND_OPTIONS` or via
-the command line arguments. A samle of this file is include in the 
-repository as `voltctl_command_options.config`.
+that the overrides don't have to be specified on each invocation.
+
+By default the file `~/.volt/command_options` is loaded, but the file used can
+also be specified by the environment variable `VOLTCTL_COMMAND_OPTIONS` or via
+the command line arguments.
+
+A sample of this file is include in the repository as
+`voltctl_command_options.config`.
 
 ### Examples
-```
-voltctl adapter list
-ID                      VENDOR                       VERSION
-acme                    Acme Inc.                    0.1
-adtran_olt              ADTRAN, Inc.                 1.36
-adtran_onu              ADTRAN, Inc.                 1.25
-asfvolt16_olt           Edgecore                     0.98
-brcm_openomci_onu       Voltha project               0.50
-broadcom_onu            Voltha project               0.46
-cig_olt                 CIG Tech                     0.11
-cig_openomci_onu        CIG Tech                     0.10
-dpoe_onu                Sumitomo Electric, Inc.      0.1
-maple_olt               Voltha project               0.4
-microsemi_olt           Microsemi / Celestica        0.2
-openolt                 OLT white box vendor         0.1
-pmcs_onu                PMCS                         0.1
-ponsim_olt              Voltha project               0.4
-ponsim_onu              Voltha project               0.4
-simulated_olt           Voltha project               0.1
-simulated_onu           Voltha project               0.1
-tellabs_olt             Tellabs Inc.                 0.1
-tellabs_openomci_onu    Tellabs Inc.                 0.1
-tibit_olt               Tibit Communications Inc.    0.1
-tibit_onu               Tibit Communications Inc.    0.1
-tlgs_onu                TLGS                         0.1
+
+```shell
+$ voltctl adapter list
+ID                   VENDOR            VERSION       SINCELASTCOMMUNICATION
+openolt              VOLTHA OpenOLT    2.3.0-dev     NEVER
+brcm_openomci_onu    VOLTHA OpenONU    2.3.0-dev     32m10s
 ```
 
-```
-voltctl device list
-ID                  TYPE          ROOT     PARENTID            SERIALNUMBER      VLAN    ADMINSTATE    OPERSTATUS    CONNECTSTATUS
-00015bbbfdb3c068    ponsim_olt    true     0001aabbccddeeff    10.1.4.4:50060    0       ENABLED       ACTIVE        REACHABLE
-0001552615104a2c    ponsim_onu    false    00015bbbfdb3c068    PSMO12345678      128     ENABLED       ACTIVE        REACHABLE
+```shell
+$ voltctl adapter list --outputas json
+[{"Id":"openolt","Vendor":"VOLTHA OpenOLT","Version":"2.3.0-dev","LogLevel":"","LastCommunication":"NEVER","SinceLastCommunication":"NEVER"},{"Id":"brcm_openomci_onu","Vendor":"VOLTHA OpenONU","Version":"2.3.0-dev","LogLevel":"DEBUG","LastCommunication":"2020-04-04T20:48:59Z","SinceLastCommunication":"1s"}]
 ```
 
-```
-voltctl device list --format 'table{{.Id}}\t{{.SerialNumber}}\t{{.ConnectStatus}}'
-ID                  SERIALNUMBER      CONNECTSTATUS
-00015bbbfdb3c068    10.1.4.4:50060    REACHABLE
-0001552615104a2c    PSMO12345678      REACHABLE
+After piping through `python -m json.tool`:
+
+```json
+[
+    {
+        "Id": "openolt",
+        "LastCommunication": "NEVER",
+        "LogLevel": "",
+        "SinceLastCommunication": "NEVER",
+        "Vendor": "VOLTHA OpenOLT",
+        "Version": "2.3.0-dev"
+    },
+    {
+        "Id": "brcm_openomci_onu",
+        "LastCommunication": "2020-04-04T20:46:45Z",
+        "LogLevel": "DEBUG",
+        "SinceLastCommunication": "1m57s",
+        "Vendor": "VOLTHA OpenONU",
+        "Version": "2.3.0-dev"
+    }
+]
 ```
 
-```
-voltctl --server voltha:50555 device list --format '{{.Id}},{{.SerialNumber}},{{.ConnectStatus}}'
-00015bbbfdb3c068,10.1.4.4:50060,REACHABLE
-0001552615104a2c,PSMO12345678,REACHABLE
-````
 
-```
-voltctl device list --outputas json
-[{"id":"00015bbbfdb3c068","type":"ponsim_olt","root":true,"parent_id":"0001aabbccddeeff","vendor":"ponsim","model":"n/a","serial_number":"10.1.4.4:50060","adapter":"ponsim_olt","Address":{"HostAndPort":"10.1.4.4:50060"},"admin_state":3,"oper_status":4,"connect_status":2},{"id":"0001552615104a2c","type":"ponsim_onu","parent_id":"00015bbbfdb3c068","parent_port_no":1,"vendor":"ponsim","model":"n/a","serial_number":"PSMO12345678","vlan":128,"Address":null,"proxy_address":{"device_id":"00015bbbfdb3c068","channel_id":128},"admin_state":3,"oper_status":4,"connect_status":2}]
+```shell
+$ voltctl device list
+ID                                      TYPE                 ROOT     PARENTID                                SERIALNUMBER    ADMINSTATE    OPERSTATUS    CONNECTSTATUS    REASON
+1398f977-3630-43d2-8d3b-1ae395a95162    openolt              true     540fc38e-cf35-4d14-8b01-7760acecefaa    BBSIM_OLT_0     ENABLED       ACTIVE        REACHABLE
+5bacc996-b922-41fc-8ddc-a92d29729955    brcm_openomci_onu    false    1398f977-3630-43d2-8d3b-1ae395a95162    BBSM00000001    ENABLED       ACTIVE        REACHABLE        omci-flows-pushed
 ```
 
-WIP - just barely started
+```shell
+$ voltctl device list --format 'table{{.Id}}\t{{.SerialNumber}}\t{{.ConnectStatus}}'
+ID                                      SERIALNUMBER    CONNECTSTATUS
+1398f977-3630-43d2-8d3b-1ae395a95162    BBSIM_OLT_0     REACHABLE
+5bacc996-b922-41fc-8ddc-a92d29729955    BBSM00000001    REACHABLE
+```
+
+```shell
+$ voltctl device list --outputas json
+[{"id":"d2960b6e-f963-4acb-83c9-492b3211cf6b","type":"brcm_openomci_onu","root":false,"parentid":"e2c1d2cd-c260-4285-8632-7b205aed660a","parentportno":536870912,"vendor":"OpenONU","model":"","hardwareversion":"","firmwareversion":"","serialnumber":"BBSM00000001","vendorid":"BBSM","adapter":"brcm_openomci_onu","vlan":0,"macaddress":"","address":"unknown","extraargs":"","proxyaddress":{"deviceId":"e2c1d2cd-c260-4285-8632-7b205aed660a","devicetype":"openolt","channelid":0,"channelgroup":0,"onuid":1,"onusessionid":0},"adminstate":"ENABLED","operstatus":"DISCOVERED","reason":"stopping-openomci","connectstatus":"UNREACHABLE","ports":[{"portno":536870912,"label":"PON port","type":"PON_ONU","adminstate":"ENABLED","operstatus":"ACTIVE","deviceid":"","peers":[{"deviceid":"e2c1d2cd-c260-4285-8632-7b205aed660a","portno":536870912}]},{"portno":16,"label":"uni-16","type":"ETHERNET_UNI","adminstate":"ENABLED","operstatus":"UNKNOWN","deviceid":"","peers":[]},{"portno":17,"label":"uni-17","type":"ETHERNET_UNI","adminstate":"ENABLED","operstatus":"DISCOVERED","deviceid":"","peers":[]},{"portno":18,"label":"uni-18","type":"ETHERNET_UNI","adminstate":"ENABLED","operstatus":"DISCOVERED","deviceid":"","peers":[]},{"portno":19,"label":"uni-19","type":"ETHERNET_UNI","adminstate":"ENABLED","operstatus":"DISCOVERED","deviceid":"","peers":[]}],"flows":[{"id":"8c4fd2d0f768700a","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":1000,"cookie":"~3fd5629a","inport":"16","vlanid":"0","setvlanid":"900","output":"536870912","writemetadata":"0x0384004000100000","meter":"2","tunnelid":"16"},{"id":"5d0b3499cd2bf4ac","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":1000,"cookie":"~4df91e40","inport":"536870912","vlanid":"900","metadata":"0x0000000000000010","setvlanid":"0","output":"16","writemetadata":"0x0000004000000000","meter":"2"},{"id":"21a5ad60293e6c60","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":10000,"cookie":"~ba31a4f2","inport":"16","ethtype":"0x0800","ipproto":"17","udpsrc":"68","dstsrc":"67","setvlanid":"900","pushvlanid":"0x8100","output":"536870912","writemetadata":"0x0000004000000000","meter":"2","tunnelid":"16"}]},{"id":"e2c1d2cd-c260-4285-8632-7b205aed660a","type":"openolt","root":true,"parentid":"28d1128f-7d9a-48fa-b60b-d96e1491d92a","parentportno":0,"vendor":"BBSim","model":"asfvolt16","hardwareversion":"","firmwareversion":"","serialnumber":"BBSIM_OLT_0","vendorid":"","adapter":"openolt","vlan":0,"macaddress":"0a:0a:0a:0a:0a:00","address":"bbsim.voltha.svc:50060","extraargs":"","adminstate":"DISABLED","operstatus":"UNKNOWN","reason":"","connectstatus":"REACHABLE","ports":[{"portno":1048576,"label":"nni-1048576","type":"ETHERNET_NNI","adminstate":"ENABLED","operstatus":"ACTIVE","deviceid":"","peers":[]},{"portno":536870912,"label":"pon-536870912","type":"PON_OLT","adminstate":"ENABLED","operstatus":"DISCOVERED","deviceid":"","peers":[{"deviceid":"d2960b6e-f963-4acb-83c9-492b3211cf6b","portno":536870912}]}],"flows":[{"id":"e1746c5320441c57","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":10000,"cookie":"~f81586a7","inport":"1048576","ethtype":"0x0800","ipproto":"17","udpsrc":"67","dstsrc":"68","output":"CONTROLLER"},{"id":"12f8e0237d36dcab","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":10000,"cookie":"~ce6c3527","inport":"1048576","ethtype":"0x88cc","output":"CONTROLLER"},{"id":"35f0a5d7315c8b8a","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":1000,"cookie":"~986cca9a","inport":"536870912","vlanid":"900","setvlanid":"900","pushvlanid":"0x8100","output":"1048576","writemetadata":"0x0000004000000000","meter":"2","tunnelid":"16"},{"id":"755a065fb691c418","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":1000,"cookie":"~531d5ec9","inport":"1048576","vlanid":"900","metadata":"0x0000000000000384","popvlan":"yes","output":"536870912","writemetadata":"0x0384004000000010","meter":"2","tunnelid":"16"},{"id":"e11f009524a53eb2","tableid":0,"durationsec":0,"durationnsec":0,"idletimeout":0,"hardtimeout":0,"packetcount":0,"bytecount":0,"priority":10000,"cookie":"~ba31a4f2","inport":"536870912","ethtype":"0x0800","vlanid":"900","ipproto":"17","udpsrc":"68","dstsrc":"67","output":"CONTROLLER","writemetadata":"0x0000004000000000","meter":"2","tunnelid":"16"}]}]
+```
diff --git a/VERSION b/VERSION
index f8f3c08..ae23c6f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.18
+1.0.19-dev