diff --git a/FEATURES.md b/FEATURES.md
new file mode 100644
index 00000000..a6eb6219
--- /dev/null
+++ b/FEATURES.md
@@ -0,0 +1,8 @@
+# General Bots Features
+
+| Feature                                                                    | BF | GB |
+|----------------------------------------------------------------------------|----|----|
+| Use of conversational administration to manage bot packages (Talk to admin | -  | X  |
+| F5 to run on VSCode                                                        | -  | X  |
+| Isolated code on packages                                                  | -  | X  |
+| Breaking changes protected                                                 | -  | X  |
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 00000000..41824d4d
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,6 @@
+# Roadmap
+
+| Title                         | Priority                                                                                                   | Release | Status |
+|-------------------------------|------------------------------------------------------------------------------------------------------------|---------|--------|
+| Isolation of .gbapp per .gbot | Today .gbapp loaded is shared across all bot instances and must be associated to one or more individually. | Medium  | 2019Q4 |
+| Python based .gbapps          | Write conversational login in Python                                                                       | Low     | -      |
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 3ea78a42..6f9195f3 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -324,6 +324,8 @@ export class AzureDeployerService extends GBService {
     instance.textAnalyticsEndpoint = textAnalytics.endpoint;
     instance.textAnalyticsKey = keys.key1;
 
+    // TODO: Check quotes being added when NLP field is filled.
+
     logger.info(`Deploying NLP...`);
     const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation);
     keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name);