Make CLI global - may need to revisit this.