many changes from actually using the CLI