diff --git a/000-index.md b/000-index.md
index a503542..93f6be6 100644
--- a/000-index.md
+++ b/000-index.md
@@ -6,3 +6,4 @@
 * [Port core to uv_link_t](004-uv_link_t.md)
 * [ABI Stable Module API](005-ABI-Stable-Module-API.md)
 * [AsyncHooks API](006-asynchooks-api.md)
+* [Extension CLI Flag](007-extension-flag.md)
diff --git a/007-extension-flag.md b/007-extension-flag.md
new file mode 100644
index 0000000..35e0746
--- /dev/null
+++ b/007-extension-flag.md
@@ -0,0 +1,57 @@
+| Title  | Implement --extension flag  |
+|--------|-----------------------------|
+| Author | @bmeck                      |
+| Status | DRAFT                       |
+| Date   | 2017-08-09T10:00:00-05:00   |
+
+## Description
+
+The Node CLI currently accepts input in both filename (`node app.js`) and opaque text stream form (`node -e '123'` and `node <app.js`). This behavior always results in running the stream as a CommonJS goal. With the upcoming usage of ESM and WASM there will be cases where developers wish to pipe other forms of text to the CLI.
+
+This proposal is to implement an `--entry-extension` CLI flag for the cases which may want to use a stream that does not have a file extension.
+
+## Example
+
+```sh
+node --entry-extension=js <app.js
+node --entry-extension=js -e $(cat <app.js)
+node --entry-extension=wasm <app.wasm
+node --entry-extension=wasm -e $(cat <app.wasm)
+node --entry-extension=mjs <app.mjs
+node --entry-extension=mjs -e $(cat <app.mjs)
+```
+
+## Considerations
+
+If mixing `--entry-extension` with a non-stream argument such as a file path or entry URL, Node should exit with an error prior to any evaluation. This also means that `--entry-extension` cannot be used to override the extension of file paths.
+
+```sh
+# exits with an error
+node --entry-extension=json app.js
+# exits with an error
+node --entry-extension=js app.js
+```
+
+### Userland Extensions
+
+Some libraries extend `require.extensions` with new extensions. These libraries should be considered when determining the list of extensions allowed in `--entry-extension`.
+
+Any future extensions to the ESM based loading mechanisms will have to account for collisions and define behavior when they collide.
+
+### Early Errors
+
+Any unknown file extension should prevent the main entry point to the program from executing anything. Preloaded files such as using `--require` should continue to load normally.
+
+Any error produced by this should describe how to get the list of known extensions; and the error should attempt to point towards how to add an extension if needed. The error may change from preferring `require.extensions` to a new mechanism that supports ESM over time.
+
+## Alternate Possibilities
+
+Some alternate possibilities exist that might be relevant. `--entry-url` for example could be used to provide an `import.meta.url` properly while also providing the pathname that contains an extension. However, since URLs are not mandated to have file extensions this might be for nothing. Applications can also access `process.cwd()` to recreate similar data to `import.meta.url`.
+
+## APIs
+
+No new runtime APIs are to be added.
+
+## Future considerations
+
+Some upcoming file formats are also proposed such as [WebPackage](https://github.com/WICG/webpackage) that would also benefit from this.