Updating this repo based on code changes from the CLI version.