diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4aaa7eb..8a22cc2 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -12,30 +12,25 @@
       "profile": "https://github.com/Ifycode",
       "contributions": [
         "code",
-        "doc",
-        "infra",
-        "maintenance",
-        "review",
-        "projectManagement",
-        "ideas"
+        "doc"
       ]
     },
     {
-      "login": "IsraelObiagba",
-      "name": "Israel Obiagba",
-      "avatar_url": "https://avatars.githubusercontent.com/u/14045379?v=4",
-      "profile": "https://github.com/IsraelObiagba",
+      "login": "chuddyjoachim",
+      "name": "Chikezie Joachim",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56943504?v=4",
+      "profile": "http://chuddyjoachim.com",
       "contributions": [
-        "mentoring"
+        "code"
       ]
     },
     {
-     "login": "jiobiagba",
-      "name": "Joseph Obiagba",
-      "avatar_url": "https://avatars.githubusercontent.com/u/42423547?v=4",
-      "profile": "https://github.com/jiobiagba",
+      "login": "all-contributors",
+      "name": "All Contributors",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46410174?v=4",
+      "profile": "https://allcontributors.org",
       "contributions": [
-        "mentoring"
+        "infra"
       ]
     }
   ],
diff --git a/.editorconfig b/.editorconfig
index 1c8f4c8..a77cada 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.ts]
+[.{js,ts}]
 quote_type = single
 
 [*.md]
diff --git a/.gitbook/.gitbook.yaml b/.gitbook/.gitbook.yaml
new file mode 100644
index 0000000..ff3e7d9
--- /dev/null
+++ b/.gitbook/.gitbook.yaml
@@ -0,0 +1 @@
+root: ./doc
diff --git a/.github/ISSUE_TEMPLATE/create-a-task.md b/.github/ISSUE_TEMPLATE/create-a-task.md
new file mode 100644
index 0000000..42a20d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/create-a-task.md
@@ -0,0 +1,19 @@
+---
+name: Create a task
+about: Pattern to follow while creating a task to be solved
+title: ''
+labels: task
+assignees: ''
+
+---
+
+Pattern to follow when creating a new task. Note: This is not for bug report. A separate template exists for reporting bugs.
+
+#### Task description
+Give brief intro and describe what the task entails. 
+
+#### Test cases and expected output
+Include test cases e.g. commands to run and expected output. Add screenshots if/where possible.
+
+#### Examples
+You can include examples of files, repos, issues or pull requests where something similar to the task you're describing has been done, if any.
diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.md b/.github/ISSUE_TEMPLATE/report-a-bug.md
new file mode 100644
index 0000000..de41e30
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-a-bug.md
@@ -0,0 +1,26 @@
+---
+name: Report a bug
+about: Found a bug? Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Run this command '....'
+3. See error etc.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..27ae2ed
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,14 @@
+**This pull request makes the following changes:**
+* Fixes issue code-collabo/node-mongo-cli#issueNumberHere 
+
+**Details:**
+* Setup for '...'
+* Adds '...' etc.
+
+**Testing checklist:**
+- [ ] Run '...'
+- [ ] Check that '...'
+- [ ] Check that '...' etc.
+- [ ] I certify that I ran my checklist.
+
+Ping @code-collabo/node-mongo-cli
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 808be5f..73ff776 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 13.x, 14.x, 15.x, 16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/.gitignore b/.gitignore
index c7e9dcf..60bb18c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
+# testing and rough work
+test.js
+
 # dependencies
 /node_modules
 
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 8b8b608..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-Moved to [docs: CODE_OF_CONDUCT](https://github.com/code-collabo/docs/blob/main/CODE_OF_CONDUCT.md)
diff --git a/LICENSE b/LICENSE
index 5f4a718..4a1839f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 ISC License (ISC)
-Copyright 2021 Code Collabo
+Copyright 2021 Obiagba Mary | Code Collabo Community
 
 Permission to use, copy, modify, and/or
 distribute this software for any purpose
@@ -18,3 +18,9 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+@dkundel's create-project LICENCE file:
+https://github.com/dkundel/create-project/blob/master/LICENSE
+
+List of project resources:
+https://code-collabo.gitbook.io/node-mongo/contribution-guide/development-mode#project-resources
diff --git a/README.md b/README.md
index 0bf7e01..cfa6e66 100644
--- a/README.md
+++ b/README.md
@@ -5,33 +5,111 @@
 
 ![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat) ![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg) ![GitHub issues](https://img.shields.io/github/issues/code-collabo/node-mongo-cli?color=red) ![GitHub pull requests](https://img.shields.io/github/issues-pr/code-collabo/node-mongo-cli?color=goldenrod)
 
-`node-mongo-cli` is a command-line interface tool useful to initialize, scaffold and make mongoDB development easier in nodejs environment. With the CLI, you can install any of the starter kit templates - [es6](https://github.com/code-collabo/node-mongo-starter-kit) and [cjs](https://github.com/code-collabo/node-mongo-starter-cjs). It not only helps install the starter-kit, but also allows you to add new model and controller files with content using simple commands.
+**Supported node versions:** node v12.x to v16.x
 
-The [cli](https://github.com/code-collabo/node-mongo-cli) is built to help provide better experience when using the starter-kit in MongoDB, MERN or MEAN projects.
+The **node-mongo-cli** is a command-line interface made with nodejs. It bootstraps any of these 3 boilerplate templates for your nodejs and/or mongoDB development:
+- [ES module template](https://github.com/code-collabo/node-mongo-esm-kit)
+- [Commonjs template](https://github.com/code-collabo/node-mongo-cjs-kit)
+- Typescript (coming soon)
+
+## Features
+### CLI
+- CLI bootstraps the esm, cjs or ts templates for nodejs and/or mongoDB development.
+- Install dependencies and intialize git for the template bootstrapped or choose to skip them.
+- Folders are automatically created based on user entry in prompt or command-line.
+- Default folder name is provided and incremented if name already exists.
+### Templates
+- [Two mongoDB connection options](https://code-collabo.gitbook.io/node-mongo/boilerplate-templates#mongodb-connection-options) to pick from in the templates: your installed mongoDB and mongoDBatlas.
+- [Demo CRUD app](https://github.com/code-collabo/node-mongo-demo-app) you can go and download to test that your connection is setup and show example usage of the templates.
+
+## Installation
+Install CLI globally with this command:
+````
+npm install -g @code-collabo/node-mongo-cli
+````
+
+## Command
+After installing globally, use the node-mongo command.
+````
+node-mongo
+````
+
+### Usage
+````
+node-mongo <folder_name> <template>  
+````
+
+### Usage example
+The example below will bootstrap the cjs template i.e. the common js template into a folder named test-folder.
+````
+node-mongo test-folder cjs
+````
+
+### Flags
+````
+-h, --help          Show help
+-i, --install       Install dependencies
+-g, --git           Initialize git repo
+-s, --skip-install  Skip installing dependencies
+-x, --skip-git      Skip initializing git
+-y, --yes           See note on --yes flag below
+````
+
+### Prompts
+If you do not specify one or both arguments above, 
+you will be prompted to add your folder name and/or 
+choose template option from list. For foldername, you 
+can choose to use the default foldername provided in
+the prompt or type in your preferred folder name.
+
+### Skip prompts
+No prompt when --yes flag is used. It skips both 
+install and git init, and uses esm template as default 
+if no template is specified or if template entered is 
+not in the template collection. In the case of folder
+name, default foldername is used if no folder name is
+specified or when folder name already exists.
 
 ## Documentation
-For easy maintenance (due to modifications to be made and addition of more features) and also to provide you better support, sections previously included in the readme have been [moved to our docs](https://github.com/code-collabo/docs). Simply click on any of the links to learn to install, use and contribute to the node-mongo project.
-#### Using node-mongo
-No user guide yet, work is still in progress.
+See the links for the official [node-mongo documentation](https://code-collabo.gitbook.io/node-mongo/) and [Code Collabo documentation](https://code-collabo.gitbook.io/doc/).
+
+## Want to contribute?
+Love the project and wish to contribute? See contribution guide in the [node-mongo gitbook documentation](https://code-collabo.gitbook.io/node-mongo/) for how to start contributing. You can also reach out to [@Ifycode](https://github.com/Ifycode) in case you need any assistance.
+
+## Appreciation
+Appreciation goes to [@dkundel](https://github.com/dkundel), [@academind](https://github.com/academind), [@CodAffection](https://github.com/CodAffection), [@coryhouse](https://github.com/coryhouse) whose awesome youTube videos, articles and/or courses helped a lot while building the node-mongo project - cli, templates and/or demo app. Also to [@IsraelObiagba](https://github.com/IsraelObiagba) and [@jiobiagba](https://github.com/jiobiagba) for their help.
+
+<table>
+  <tr>
+    <td align="center"><a href="https://dkundel.com"><img src="https://avatars.githubusercontent.com/u/1505101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dominik Kundel</b></sub></a><br /><a href="#mentoring-dkundel" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="https://academind.com"><img src="https://avatars.githubusercontent.com/u/28806202?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Academind</b></sub></a><br /><a href="#mentoring-academind" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="http://codaffection.com/"><img src="https://avatars.githubusercontent.com/u/32505654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CodAffection</b></sub></a><br /><a href="#mentoring-CodAffection" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="http://www.bitnative.com"><img src="https://avatars.githubusercontent.com/u/1688997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory House</b></sub></a><br /><a href="#mentoring-coryhouse" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="https://github.com/IsraelObiagba"><img src="https://avatars.githubusercontent.com/u/14045379?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Israel Obiagba</b></sub></a><br /><a href="#mentoring-IsraelObiagba" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="https://github.com/jiobiagba"><img src="https://avatars.githubusercontent.com/u/42423547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Obiagba</b></sub></a><br /><a href="#mentoring-jiobiagba" title="Mentoring">🧑‍🏫</a></td>
+  </tr>
+</table>
 
-#### Contributing to node-mongo
-* See [docs: contributor guide](https://github.com/code-collabo/docs/tree/main/contributor-guide) which contains ***contributing.md***, ***CODE_OF_CONDUCT***, ***git workflow*** and ***project development setup*** to help you get started.
+<!--
+## Technologies
 
-## Resources
-You can [use these resources](https://github.com/code-collabo/docs/blob/main/contributor-guide/node-mongo-project/resources.md) as guide while contributing to the project. Appreciation goes to authors [@dkundel](https://github.com/dkundel), [@academind](https://github.com/academind), [@CodAffection](https://github.com/CodAffection), whose awesome youTube videos and/or articles make up this list of resources, and which have been useful to building the node-mongo project so far. Also to [@coryhouse](https://github.com/coryhouse), author of building a javascript development environment course.
+[<img alt="javascript" height="25px" src="https://www.freepnglogos.com/uploads/javascript/javascript-online-logo-for-website-0.png" />](https://github.com/code-collabo/node-mongo-cli)
+[<img alt="node js" height="25px" src="https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg" />](https://github.com/code-collabo/node-mongo-cli)
+[<img alt="mongoDB" height="25px" src="https://webassets.mongodb.com/_com_assets/cms/MongoDB_Logo_FullColorBlack_RGB-4td3yuxzjs.png" />](https://github.com/code-collabo/node-mongo-cli)
+-->
 
 ## Contributors ✨
 
-Thanks to these wonderful people helping to improve the ***node-mongo-cli*** project [= (emoji key) =>](https://allcontributors.org/docs/en/emoji-key)
+Thanks to these amazing contributors to the node-mongo-cli project. This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. See [emoji key](https://allcontributors.org/docs/en/emoji-key). Contributions of any kind welcome!
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://github.com/Ifycode"><img src="https://avatars.githubusercontent.com/u/45185388?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Obiagba Mary Ifeoma</b></sub></a><br /><a href="https://github.com/code-collabo/node-mongo-cli/commits?author=Ifycode" title="Code">💻</a> <a href="https://github.com/code-collabo/node-mongo-cli/commits?author=Ifycode" title="Documentation">📖</a> <a href="#infra-Ifycode" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Ifycode" title="Maintenance">🚧</a> <a href="https://github.com/code-collabo/node-mongo-cli/pulls?q=is%3Apr+reviewed-by%3AIfycode" title="Reviewed Pull Requests">👀</a> <a href="#projectManagement-Ifycode" title="Project Management">📆</a> <a href="#ideas-Ifycode" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/IsraelObiagba"><img src="https://avatars.githubusercontent.com/u/14045379?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Israel Obiagba</b></sub></a><br /><a href="#mentoring-IsraelObiagba" title="Mentoring">🧑‍🏫</a></td>
-    <td align="center"><a href="https://github.com/jiobiagba"><img src="https://avatars.githubusercontent.com/u/42423547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Obiagba</b></sub></a><br /><a href="#mentoring-jiobiagba" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="https://github.com/Ifycode"><img src="https://avatars.githubusercontent.com/u/45185388?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Obiagba Mary Ifeoma</b></sub></a><br /><a href="https://github.com/code-collabo/node-mongo-cli/commits?author=Ifycode" title="Code">💻</a> <a href="https://github.com/code-collabo/node-mongo-cli/commits?author=Ifycode" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://chuddyjoachim.com"><img src="https://avatars.githubusercontent.com/u/56943504?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chikezie Joachim</b></sub></a><br /><a href="https://github.com/code-collabo/node-mongo-cli/commits?author=chuddyjoachim" title="Code">💻</a></td>
+    <td align="center"><a href="https://allcontributors.org"><img src="https://avatars.githubusercontent.com/u/46410174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>All Contributors</b></sub></a><br /><a href="#infra-all-contributors" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
   </tr>
 </table>
 
@@ -39,11 +117,3 @@ Thanks to these wonderful people helping to improve the ***node-mongo-cli*** pro
 <!-- prettier-ignore-end -->
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
-
-See complete list of Code Collabo contributors in the [docs: all-contributors.md](https://github.com/code-collabo/docs/blob/main/all-contributors.md).
-
-## Technologies
-
-[<img alt="javascript" height="25px" src="https://www.freepnglogos.com/uploads/javascript/javascript-online-logo-for-website-0.png" />](https://github.com/code-collabo/node-mongo-cli)
-[<img alt="node js" height="25px" src="https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg" />](https://github.com/code-collabo/node-mongo-cli)
-[<img alt="mongoDB" height="25px" src="https://webassets.mongodb.com/_com_assets/cms/MongoDB_Logo_FullColorBlack_RGB-4td3yuxzjs.png" />](https://github.com/code-collabo/node-mongo-cli)
diff --git a/bin/create-node-mongo-project b/bin/create-node-mongo-project
old mode 100644
new mode 100755
diff --git a/bin/customize-preinstall b/bin/customize-preinstall
deleted file mode 100644
index dbc05a9..0000000
--- a/bin/customize-preinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-require = require('esm')(module /*, options */);
-require('../src/customize/customize').customize();
diff --git a/contributing.md b/contributing.md
deleted file mode 100644
index a4f93b8..0000000
--- a/contributing.md
+++ /dev/null
@@ -1 +0,0 @@
-Moved to [docs: contributing.md](https://github.com/code-collabo/docs/blob/main/contributing.md)
diff --git a/contributor.md b/contributor.md
deleted file mode 100644
index 34be49f..0000000
--- a/contributor.md
+++ /dev/null
@@ -1 +0,0 @@
-Move ***node-mongo-cli*** contributors here once the readme looks too crowded.
diff --git a/doc/README.md b/doc/README.md
new file mode 100644
index 0000000..fc67c64
--- /dev/null
+++ b/doc/README.md
@@ -0,0 +1,68 @@
+# node-mongo CLI
+
+![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat) ![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg) ![GitHub issues](https://img.shields.io/github/issues/code-collabo/node-mongo-cli?color=red) ![GitHub pull requests](https://img.shields.io/github/issues-pr/code-collabo/node-mongo-cli?color=goldenrod)
+
+**Supported node versions:** node v12.x to v16.x
+
+The **node-mongo** project has 3 main projects:
+
+* The node-mongo CLI to bootstrap boilerplate templates.
+* 3 boilerplate templates for nodejs and/or mongoDB development.
+* Demo CRUD app to test connection and show example usage of the templates.
+
+## CLI Features
+
+* CLI bootstraps the esm, cjs or ts templates for nodejs and/or mongoDB development.
+* Install dependencies and intialize git for the template bootstrapped or choose to skip them.
+* Folders are automatically created based on user entry in prompt or command-line.
+* Default folder name is provided and incremented if name already exists.
+
+## **CLI Installation**
+
+Install **node-mongo-cli** globally with this command:
+
+```text
+npm install -g @code-collabo/node-mongo-cli
+```
+
+## Command
+
+After installing globally, use the node-mongo command.
+
+```text
+node-mongo
+```
+
+### Usage
+
+```text
+node-mongo <folder_name> <template>
+```
+
+### Usage example
+
+The example below will bootstrap the cjs template i.e. the common js template into a folder named test-folder.
+
+```text
+node-mongo test-folder cjs
+```
+
+### Flags
+
+```text
+-h, --help          Show help
+-i, --install       Install dependencies
+-g, --git           Initialize git repo
+-s, --skip-install  Skip installing dependencies
+-x, --skip-git      Skip initializing git
+-y, --yes           See note on --yes flag below
+```
+
+### Prompts
+
+If you do not specify one or both arguments above, you will be prompted to add your folder name and/or choose template option from list. For folder name, you can choose to use the default folder name provided in the prompt or type in your preferred folder name.
+
+### Skip prompts
+
+No prompt when --yes flag is used. It skips both install and git init, and uses esm template as default if no template is specified or if template entered is not in the template collection. In the case of folder name, default folder name is used if no folder name is specified or when folder name already exists.
+
diff --git a/doc/SUMMARY.md b/doc/SUMMARY.md
new file mode 100644
index 0000000..6f288ea
--- /dev/null
+++ b/doc/SUMMARY.md
@@ -0,0 +1,20 @@
+# Table of contents
+
+* [node-mongo CLI](README.md)
+* [Boilerplate templates](boilerplate-templates.md)
+* [Demo CRUD app](demo-crud-app.md)
+
+## contribution guide
+
+* [Contribution guidelines](https://code-collabo.gitbook.io/doc/collabo-guidelines/contributing)
+* [Development mode](contribution-guide/development-mode.md)
+
+## All contributors
+
+* [All contributors](https://github.com/code-collabo/node-mongo-cli#contributors-)
+
+## useful links
+
+* [Release notes](https://github.com/code-collabo/node-mongo-cli/releases)
+* [Report or fix issues](https://github.com/code-collabo/node-mongo-cli/issues)
+
diff --git a/doc/boilerplate-templates.md b/doc/boilerplate-templates.md
new file mode 100644
index 0000000..275d2af
--- /dev/null
+++ b/doc/boilerplate-templates.md
@@ -0,0 +1,62 @@
+# Boilerplate templates
+
+There are 3 boilerplate templates generated by the Command Line Interface \(CLI\), for nodejs and/or mongoDB development and that you can choose from:
+
+* [ES module template](https://github.com/code-collabo/node-mongo-esm-kit)
+* [Commonjs template](https://github.com/code-collabo/node-mongo-cjs-kit)
+* Typescript \(coming soon\)
+
+## Installation
+
+Download the template\(s\) locally unto your computer through the CLI. The CLI is built to provide better experience, but you can also clone or download it manually. In the case where you are having issues using the CLI, download the template\(s\) from Github. Report issues in [the issues tab of the node-mongo-cli repo](https://github.com/code-collabo/node-mongo-cli/issues).
+
+Change directory \(cd\) into the root of the downloaded template and install dependencies:
+
+```text
+npm install
+```
+
+Start server and mongoDB connection:
+
+```text
+npm start
+```
+
+**Note:** Incase you see an error message in the terminal, the next sections will guide you on how to set up your mongoDB connection successfully.
+
+## MongoDB connection options
+
+There are two monogoDB connection options already setup for you to choose from: 
+
+* Connection to MongoDB installed on your computer. 
+* Connection to MongoDB atlas
+
+In the case where the error message "Error in DB connection" is displayed in the terminal when you start the server, you need to either install and get mongoDB running for use locally on your computer or setup mongoDB atlas. Once you have done any of these, the message "Installed MongoDB connection successful!!!" or "MongoDB ATLAS connection successful!!!" should now show up in the terminal. More notes in the sections that explain the mongoDB connection options individually. [Visit mongoDB documentation to install mongoDB](https://docs.mongodb.com/guides/server/install/) on your computer and get mongoDB running if you haven't. [Or choose to use mongoDB atlas](https://docs.atlas.mongodb.com/getting-started/) and connect to your cluster.
+
+### Installed mongoDB option
+
+Create a .env file in the root of the downloaded template. After installing mongoDB, keep mongoDB running in the terminal\(s\) as shown in the mongoDB documentation. Create a database and give it any name of your choice. Go to src/db.js file, you will see that there is a DBNAME environment variable i.e. **process.env.DBNAME** in the mongoDB connection string. You want to store the database name that you created in this variable. Store your database name in the variable inside the .env file you created earlier like so:
+
+```text
+DBNAME="insert-your-own-db-name-here"
+```
+
+You can add other environment variables if you like, but this tutorial is going to stick to this simple setup. Also create a collection. You can use the collection name "demo" from the src/api/models/demo.js file while you follow this tutorial. You can always use a different name later on once you get used to how the template is setup. In the src/app.js file, you will find the import named "mongooseModuleExport" which is what you need. If you ever need to use the mongoDB atlas option, then you will need to comment out mongooseModuleExport and remove comment from "mongooseModuleExportAtlas" so that you can access the db connection set up for atlas instead. Since you have chosen to install mongoDB locally on your computer, use the mongooseModuleExport import. So you don't need to change anything in the src/app.js file. Open up [http://localhost:3000](http://localhost:3000) in the browser to see the message "App works" displayed on the screen. Also see [http://localhost:3000/demo](http://localhost:3000/demo) for items in your demo collection. Count should be zero and items should be an empty array since you have not added anything in the database.
+
+### MongoDB atlas option
+
+Create a .env file in the root of the downloaded template. Create a database \(and collection\) and connect to your cluster following the mongoDB documentation. Go to src/atlas/db.js file, you will see that there are environment variables i.e. **process.env.USERNAME**, **process.env.PASSWORD**, **process.env.CLUSTERNAME**, **process.env.DBNAME** in the mongoDB connection string. You want to store your username, password, cluster name and database name that you created with atlas inside these variables. Store them in the variables inside the .env file you created earlier like so:
+
+```text
+DBNAME="insert-your-own-db-name-here"
+USERNAME="insert-your-own-username-here"
+PASSWORD="insert-your-own-password-here"
+CLUSTERNAME="insert-your-own-clustername-here"
+```
+
+Use the collection name "demo" from the src/api/models/demo.js file while you follow this tutorial. You can always use a different name later on once you get used to how the template is setup. In the src/app.js file, you will find the import named "mongooseModuleExportAtlas" which is what you need but is commented out. Comment out "mongooseModuleExport" and remove comment from mongooseModuleExportAtlas so that you can access the db connection set up for atlas instead. If you ever need to use the installed mongoDB option, then you will need to comment out mongooseModuleExportAtlas and remove comment from mongooseModuleExport so that you can access the db connection setup for the installed mongoDB option. Open up [http://localhost:3000](http://localhost:3000) in the browser to see the message "App works" displayed on the screen. Also see [http://localhost:3000/demo](http://localhost:3000/demo) for items in your demo collection. Count should be zero and items should be an empty array since you have not added anything in the database.
+
+## Customising dev environment
+
+Replace "insert-your-project-name" with your own project name in the src/startMessage.js file. Modify template as you like it.
+
diff --git a/doc/contribution-guide/development-mode.md b/doc/contribution-guide/development-mode.md
new file mode 100644
index 0000000..71ac3eb
--- /dev/null
+++ b/doc/contribution-guide/development-mode.md
@@ -0,0 +1,43 @@
+# Development mode
+
+Love the project and wish to contribute? See the [git workflow](https://code-collabo.gitbook.io/doc/collabo-guidelines/contributing#git-workflow) section of the contribution guidelines page for how to set up project locally, and branching and other instructions. You can also reach out to [@Ifycode](https://github.com/Ifycode) in case you need any assistance. The sections below show how to run the node-mongo projects in development.
+
+## node-mongo CLI
+
+The commands to run when developing the [node-mongo-cli](https://github.com/code-collabo/node-mongo-cli) are the same as what is on the [node-mongo CLI page](https://code-collabo.gitbook.io/node-mongo/) for users. The installation however is different. 
+
+Install dependencies:
+
+```text
+npm install
+```
+
+Run eslint:
+
+```text
+npm start
+```
+
+Run jasmine test:
+
+```text
+npm test
+```
+
+{% hint style="success" %}
+You can decide to open separate terminals for eslint and jasmine to keep running while you work on the CLI in another terminal.
+{% endhint %}
+
+## Boilerplate templates and demo app
+
+Run the boilerplate templates and demo app exactly as described on the [boilerplate templates](https://code-collabo.gitbook.io/node-mongo/boilerplate-templates) and the [demo CRUD app](https://code-collabo.gitbook.io/node-mongo/demo-crud-app) pages respectively.
+
+## Project resources
+
+Consult these resources by  [@dkundel](https://github.com/dkundel), [@academind](https://github.com/academind) and [@CodAffection](https://github.com/CodAffection) to get a background of the CLI, boilerplate templates and the demo-app:
+
+* [How to build a CLI with node.js](https://youtu.be/s2h28p4s-Xs) - _youTube video_.
+* [How to build a CLI with node.js](https://www.twilio.com/blog/how-to-build-a-cli-with-node-js) - _the article_.
+* [Building a restful API with node.js](https://academind.com/tutorials/building-a-restful-api-with-nodejs/).
+* [MEAN stack CRUD operations](https://youtu.be/UYh6EvpQquw) - _1st 33 minutes_.
+
diff --git a/doc/demo-crud-app.md b/doc/demo-crud-app.md
new file mode 100644
index 0000000..f5f8eef
--- /dev/null
+++ b/doc/demo-crud-app.md
@@ -0,0 +1,20 @@
+# Demo CRUD app
+
+## Interacting with database
+
+You can use postman or any other tool to add data or remove data from the database. To make it easy to test that all is well setup and also to show example usage of the template with a client app in development, you can download the [node-mongo-demo-app](https://github.com/code-collabo/node-mongo-demo-app).
+
+Change directory \(cd\) into the root of the demo app and install dependencies:
+
+```text
+npm install
+```
+
+Start the app:
+
+```text
+npm start
+```
+
+View the demo app in the browser at [http://localhost:4200](http://localhost:4200). Although the app is built with angular, you don't need to have any knowledge of how to write an angular application. Just interact with form supplying name and age \(these have been configured in the template's src/api/ folder\). Make sure to keep port 3000 still running. You will see your entries in a table under the form. You can also always refresh your browser for [http://localhost:3000/demo](http://localhost:3000/demo) to see that the changes you made are now returned as json and are in the database.
+
diff --git a/package-lock.json b/package-lock.json
index 6573f54..4a48165 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1311,25 +1311,12 @@
         "defer-to-connect": "^1.0.1"
       }
     },
-    "@types/execa": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@types/execa/-/execa-0.9.0.tgz",
-      "integrity": "sha512-mgfd93RhzjYBUHHV532turHC2j4l/qxsF/PbfDmprHDEUHmNZGlDn1CEsulGK3AfsPdhkWzZQT/S/k0UGhLGsA==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
-    "@types/node": {
-      "version": "11.15.49",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.49.tgz",
-      "integrity": "sha512-ft3FD0S4sSu+nA//lFRPLPKqHa3qCIIOjHI3/e9H0o37pCtVNU9W7f9YRYjAiysDmHlLL+gBpNKV5BNahy1fqw=="
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1727,16 +1714,16 @@
       }
     },
     "browserslist": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-      "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "electron-to-chromium": "^1.3.649",
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.70"
+        "node-releases": "^1.1.75"
       }
     },
     "buffer-from": {
@@ -1811,9 +1798,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001202",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001202.tgz",
-      "integrity": "sha512-ZcijQNqrcF8JNLjzvEiXqX4JUYxoZa7Pvcsd9UD8Kz4TvhTonOSNRsK+qtvpVL4l6+T1Rh4LFtLfnNWg6BGWCQ==",
+      "version": "1.0.30001257",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz",
+      "integrity": "sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA==",
       "dev": true
     },
     "chalk": {
@@ -2060,9 +2047,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
       "dev": true
     },
     "commander": {
@@ -2315,9 +2302,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.691",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.691.tgz",
-      "integrity": "sha512-ZqiO69KImmOGCyoH0icQPU3SndJiW93juEvf63gQngyhODO6SpQIPMTOHldtCs5DS5GMKvAkquk230E2zt2vpw==",
+      "version": "1.3.836",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz",
+      "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg==",
       "dev": true
     },
     "elegant-spinner": {
@@ -2334,6 +2321,7 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -3304,9 +3292,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
     "http-cache-semantics": {
       "version": "4.1.0",
@@ -4346,9 +4334,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
       "dev": true
     },
     "nodemon": {
@@ -4428,9 +4416,9 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "dev": true
     },
     "npm-run-all": {
@@ -4653,6 +4641,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -4690,11 +4679,6 @@
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
       "dev": true
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -4800,9 +4784,9 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-type": {
       "version": "3.0.0",
@@ -4846,91 +4830,6 @@
         "find-up": "^3.0.0"
       }
     },
-    "pkg-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-install/-/pkg-install-1.0.0.tgz",
-      "integrity": "sha512-UGI8bfhrDb1KN01RZ7Bq08GRQc8rmVjxQ2up0g4mUHPCYDTK1FzQ0PMmLOBCHg3yaIijZ2U3Fn9ofLa4N392Ug==",
-      "requires": {
-        "@types/execa": "^0.9.0",
-        "@types/node": "^11.9.4",
-        "execa": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -4973,6 +4872,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -5754,11 +5654,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
     },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
     "strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -6290,7 +6185,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write-file-atomic": {
       "version": "3.0.3",
diff --git a/package.json b/package.json
index 0a7f9c3..79b1af6 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@code-collabo/node-mongo-cli",
   "version": "1.0.0",
-  "description": "node-mongo-cli package to bootstrap mongodb projects by Code Collabo community.",
+  "description": "node-mongo-cli Command Line Interface made with nodejs to bootstrap any of 3 boilerplate templates for your nodejs and/or mongoDB development.",
   "main": "src/cli.js",
   "bin": {
     "@code-collabo/node-mongo-cli": "bin/create-node-mongo-project",
     "node-mongo": "bin/create-node-mongo-project"
   },
   "publicConfig": {
+    "registry": "https://npm.pkg.github.com",
     "access": "public"
   },
   "scripts": {
-    "preinstall": "node bin/customize-preinstall",
     "prestart": "node -r esm src/customize/startMessage.js",
     "start": "npm-run-all --parallel lint:watch",
     "lint": "esw src --color",
@@ -27,14 +27,21 @@
   },
   "keywords": [
     "cli",
-    "node-mongo-cli",
+    "boilerplate",
+    "template",
+    "create",
     "node",
     "nodejs",
-    "mongo",
+    "node-mongo",
+    "node-mongo-cli",
+    "mongod",
     "mongodb",
+    "atlas",
+    "esm",
+    "cjs",
     "javascript"
   ],
-  "author": "Code Collabo",
+  "author": "Obiagba Mary | Code Collabo Community",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/code-collabo/node-mongo-cli/issues"
@@ -50,8 +57,7 @@
     "inquirer": "^8.0.0",
     "listr": "^0.14.3",
     "ncp": "^2.0.0",
-    "npm-run-all": "^4.1.5",
-    "pkg-install": "^1.0.0"
+    "npm-run-all": "^4.1.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.13.10",
diff --git a/src/cli.js b/src/cli.js
index b87ded4..791a4f6 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -1,119 +1,59 @@
 import arg from 'arg';
-import inquirer from 'inquirer';
-import { createProject } from './main';
-import chalk from 'chalk';
+import { help } from './help';
+import { notRecognised } from './help';
+import { folderNameMissingOptionPrompt } from './prompts/foldername';
+import { templateMissingOptionPrompt } from './prompts/template';
+import { downloadTemplateKit } from './main';
 
 let parseArgumentsIntoOptions = (rawArgs) => {
 
-  //make -x the alias for --skip-git
+  //configure --skip-git flag
   let myHandler = (value, argName, previousValue) => {
     return previousValue || '--skip-git';
   }
 
-  const args = arg({
-    '--git': Boolean,
-    '--skip-git': Boolean,
-    '--yes': Boolean,
-    '--install': Boolean,
-    '--skip-install': Boolean,
-    '-g': '--git',
-    '--skip-git': arg.flag(myHandler), //eslint-disable-line no-dupe-keys
-    '-x': '--skip-git',
-    '-y': '--yes',
-    '-i': '--install',
-    '-s': '--skip-install'
-  },
-  {
-    argv: rawArgs.slice(2)
-  });
-
-  return {
-    skipPrompts: args['--yes'] || false,
-    git: args['--git'] || true,
-    skipGit: args['--skip-git'],
-    folderName: args._[0],
-    template: args._[1],
-    runInstall: args['--install'] || true,
-    skipInstall: args['--skip-install'] || false
+  //configure --help flag
+  let helpHandler = (value, argName, previousValue) => {
+    return previousValue || '--help';
   }
-}
-
-let promptForMissingOptions = async (options) => {
-  const [defaultFolderName, defaultTemplate] = ['node-mongo-starter-kit', 'es6'];
 
-  const questions = [];
-
-  if (!options.folderName) {
-    questions.push({
-      type: 'input',
-      name: 'folderName',
-      message: 'Please enter folder name:',
-      default: defaultFolderName
+  try {
+    const args = arg({
+      '--git': Boolean,
+      '--skip-git': Boolean,
+      '--yes': Boolean,
+      '--install': Boolean,
+      '--skip-install': Boolean,
+      '--help': Boolean,
+      '-g': '--git',
+      '--skip-git': arg.flag(myHandler), //eslint-disable-line no-dupe-keys
+      '-x': '--skip-git',
+      '-y': '--yes',
+      '-i': '--install',
+      '-s': '--skip-install',
+      '--help': arg.flag(helpHandler),
+      '-h': '--help'
+    },
+    {
+      argv: rawArgs.slice(2)
     });
-  }
-
-  const templateCollection = [defaultTemplate, 'cjs', 'ts-es6'];
-
-  const equalToAtLeastOneTemplate = templateCollection.some(tc => {
-    return tc === options.template
-  });
-
-  const notAmongTemplateCollection = equalToAtLeastOneTemplate === false;
-
-  if (notAmongTemplateCollection && options.skipPrompts && options.template !== undefined) {
-    console.log( chalk.cyanBright(`Cli does not have template: "${options.template}" in its template collection, the default template: "${defaultTemplate}" will be used instead.`) );
-  }
-
-  if (notAmongTemplateCollection && options.skipPrompts && options.template === undefined) {
-    console.log( chalk.cyanBright(`No template specified, the default template: "${defaultTemplate}" will be used instead.`) );
-  }
 
-  if (options.skipPrompts) {
     return {
-      ...options,
-      folderName: options.folderName || defaultFolderName,
-      template: defaultTemplate,
-      runInstall: false,
-      git: false
-    }
-  }
-
-  if (!options.template || notAmongTemplateCollection) {
-    questions.push({
-      type: 'list',
-      name: 'template',
-      message: 'Please choose which project template to use',
-      choices: templateCollection,
-      default: defaultTemplate
-    });
-  }
-
-  if (notAmongTemplateCollection && options.template !== undefined) {
-    console.log( chalk.cyanBright(`Cli does not have template: "${options.template}" in its template collection`) );
-  }
-
-  const answers = await inquirer.prompt(questions);
-
-  if (notAmongTemplateCollection) {
-    return {
-      ...options,
-      folderName: options.folderName || answers.folderName,
-      template: answers.template,
-      git: options.git || answers.git
-    }
-  }
-
-  return {
-    ...options,
-    folderName: options.folderName || answers.folderName,
-    template: options.template || answers.template,
-    git: options.git || answers.git
+      skipPrompts: args['--yes'] || false,
+      git: args['--git'] || true,
+      skipGit: args['--skip-git'],
+      folderName: args._[0],
+      template: args._[1],
+      runInstall: args['--install'] || true,
+      skipInstall: args['--skip-install'] || false,
+      help: args['--help'] || false
+    }  
+  } catch (err) {
+    notRecognised();
   }
 }
 
-export let cli = async (args) => {
-  let options = parseArgumentsIntoOptions(args);
-
+let otherOptions = async (options) => {
   if (options.skipInstall) {
     options.runInstall = false;
   }
@@ -122,13 +62,29 @@ export let cli = async (args) => {
     options.git = false;
   }
 
-  options = await promptForMissingOptions(options);
+  let [updatedOptions, folderNameAnswers, defaultFolderName] = await folderNameMissingOptionPrompt(options);
+
+  options = await templateMissingOptionPrompt(updatedOptions, folderNameAnswers, defaultFolderName);
 
   //console.log(options);
 
   try {
-    await createProject(options);
+    await downloadTemplateKit(options);
   } catch (err) {
     console.log('Error | ', err);
   }
 }
+
+export let cli = async (args) => {
+  let options = parseArgumentsIntoOptions(args);
+
+  try {
+    if (options.help) {
+      help();
+    } else {
+      await otherOptions(options);
+    }
+  } catch (err) {
+    console.log('');
+  } 
+}
diff --git a/src/help.js b/src/help.js
new file mode 100644
index 0000000..fcba968
--- /dev/null
+++ b/src/help.js
@@ -0,0 +1,53 @@
+
+export const help = () => {
+console.log(
+`
+Usage:
+node-mongo <folder_name> <template>  
+
+Command:
+node-mongo
+
+Arguments:
+<folder_name>   Replace this with your folder name
+<template>      Available templates: esm, cjs (and ts coming soon)
+
+Usage example:
+node-mongo test-folder cjs
+
+The above example bootstraps the cjs template i.e. 
+the common js template into a folder named test-folder.
+
+Prompts:
+If you do not specify one or both arguments above, 
+you will be prompted to add your folder name and/or 
+choose template option from list. For foldername, you 
+can choose to use the default foldername provided in
+the prompt or type in your preferred folder name.
+
+Flags:
+-h, --help          Show help
+-i, --install       Install dependencies
+-g, --git           Initialize git repo
+-s, --skip-install  Skip installing dependencies
+-x, --skip-git      Skip initializing git
+-y, --yes           See note on --yes flag below
+
+No prompt when --yes flag is used. It skips both 
+install and git init, and uses esm template as default 
+if no template is specified or if template entered is 
+not in the template collection. In the case of folder
+name, default foldername is used if no folder name is
+specified or when folder name already exists.
+`
+);
+}
+
+export const notRecognised = () => {
+console.log(
+`
+Flag(s) not recognised. Use the help command below for more info:
+
+node-mongo --help`
+);
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4926320..a374968 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,18 +5,18 @@ import path from 'path';
 import { promisify } from 'util';
 import execa from 'execa';
 import Listr from 'listr';
-import { projectInstall } from 'pkg-install';
+import { spawn } from 'child_process';
 
 const access = promisify(fs.access);
 const copy = promisify(ncp);
 
-let copyTemplateFiles = async (options) => {
+let copyTemplateFolderContent = async (options) => {
   return copy(options.templateDirectory, options.targetDirectory, {
     clobber: false
   });
 }
 
-export async function initGit(options) {
+let gitInit = async (options) => {
   if (options.git) { //git init only if git returns true
     const result = await execa('git', ['init'], {
       cwd: options.targetDirectory
@@ -30,7 +30,15 @@ export async function initGit(options) {
   return;
 }
 
-export let createProject = async (options) => {
+let npmInstall = async (options) => {
+  if (options.runInstall) { //install only if runInstall returns true
+    spawn('npm', ['install'], {cwd: options.targetDirectory, stdio: 'inherit'});
+  }
+
+  return;
+}
+
+export let downloadTemplateKit = async (options) => {
   options = {
     ...options,
     targetDirectory: options.targetDirectory || process.cwd() //root/parent folder at this point
@@ -45,42 +53,47 @@ export let createProject = async (options) => {
 
   const currentFileUrl = import.meta.url;
 
-  const templateDir = path.resolve(
-    new URL(currentFileUrl).pathname.substring(new URL(currentFileUrl).pathname.indexOf('/') + 1),
-    '../../templates',
-    options.template.toLowerCase()
-  );
+  let newUrl;
+  if (process.platform === 'darwin') newUrl = new URL(currentFileUrl).pathname;
+   else newUrl = new URL(currentFileUrl).pathname.substring(new URL(currentFileUrl).pathname.indexOf('/') + 1);
 
+  const templateDir = path.resolve(newUrl, '../../templates', options.template.toLowerCase());
+  
   options.templateDirectory = templateDir;
 
   try {
-    await access(templateDir, fs.constants.R_OK);
+    await access(templateDir, fs.constants.R_OK).then(_ => {
+      /* rename name option in package.json same as project/folder name */
+      execa('npx', ['npe','name',options.folderName], {
+        cwd: options.targetDirectory
+      }).stdout.pipe(process.stdout);
+    })
+    
   }catch (err) {
-    console.error(`\n%s "${options.template}" is (probably) an invalid template name i.e. not among template name stored in the templateCollection variable/array.`, chalk.red.bold('ERROR'));
+    console.error(`\n%s Template name or directory path is (probably) incorrect`, chalk.red.bold('ERROR'));
     process.exit(1);
   }
 
-  const tasks = new Listr([
+  const listrTasks = new Listr([
     {
-      title: 'copy project files',
-      task: () => copyTemplateFiles(options)
+      title: `${chalk.green(`${options.template} template`)} copied into the generated folder ${chalk.green(`=> ${options.folderName}`)}`,
+      task: () => copyTemplateFolderContent(options)
     },
     {
-      title: 'Initialize git',
-      task: () => initGit(options),
-      skip: () => !options.git ? 'Automatically initialize git by doing nothing. Alternatively, pass --git or -g' : undefined
+      title: 'git init',
+      task: () => gitInit(options),
+      skip: () => !options.git ? 'Skipped because you specified either --skip-git or --yes flags' : undefined
     },
     {
-      title: 'Install dependencies',
-      task: () => projectInstall({
-        cwd: options.targetDirectory
-      }),
-      skip: () => !options.runInstall ? 'Automatically install dependencies by doing nothing. Alternatively, pass --install or -i' : undefined
+      title: 'npm install',
+      task: () => npmInstall(options),
+      skip: () => !options.runInstall ? 'Skipped because you specified either --skip-install or --yes flags' : undefined
     }
   ]);
 
-  await tasks.run();
+  await listrTasks.run();
+
+  //await npmInstall(options);
 
-  console.log(`%s Project bootstrapped into the folder you specified => ${options.folderName} <=`, chalk.green.bold('DONE'));
   return true;
 }
diff --git a/src/prompts/foldername.js b/src/prompts/foldername.js
new file mode 100644
index 0000000..eb646c6
--- /dev/null
+++ b/src/prompts/foldername.js
@@ -0,0 +1,122 @@
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+import fs from 'fs';
+
+export const folderNameMissingOptionPrompt = async (options) => {
+    let defaultFolderName = 'node-mongo-kit';
+    const folderQuestions = [];
+  
+    let questionPush = (msgString, folder) => {
+      folderQuestions.push({
+        type: 'input',
+        name: 'folderName',
+        message: msgString,
+        default: folder
+      });
+    }
+
+    const rootDir = process.cwd();
+    const rootDirContent = fs.readdirSync(rootDir, (err, files) => {
+      if (err) {
+        throw err;
+      }
+  
+      return files;
+    });
+  
+    rootDirContent.push('');
+  
+    let matchDefaultValue = rootDirContent.filter(content => {
+      return content.match(defaultFolderName);
+    });
+  
+    let folderNameAnswers;
+
+    let extractedNumbers = matchDefaultValue.map((value) => {
+      let valueMatch = value.match(/(\d+)/);
+      if (valueMatch !== null) return value.match(/(\d+)/).map(Number)[0];
+    }).filter(value => { return value !== undefined; });
+
+    let maxNumber = Math.max(...extractedNumbers);
+
+    let incrementFolderName = () => {
+      if (matchDefaultValue.length >= 1) {
+        if (maxNumber === -Infinity) defaultFolderName = `${defaultFolderName}-${matchDefaultValue.length}`;
+          else defaultFolderName = `${defaultFolderName}-${maxNumber + 1}`;
+      }
+    }
+
+    if (!options.folderName && options.skipPrompts) incrementFolderName();
+  
+    if (!options.folderName && !options.skipPrompts) {
+      incrementFolderName();
+      questionPush('Please enter folder name:', defaultFolderName);
+      folderNameAnswers = await inquirer.prompt(folderQuestions);
+    }
+  
+    if (options.folderName && !options.skipPrompts) {
+      try {
+        fs.accessSync(`./${options.folderName}`, fs.constants.F_OK);
+          console.log( chalk.cyanBright(`Folder name ${chalk.green(`${options.folderName}`)} already exists`) );
+          questionPush( 'Enter different folder name:', null);
+          folderNameAnswers = await inquirer.prompt(folderQuestions);
+      } catch (err) {
+        if (err) {
+          folderNameAnswers = {folderName: ''};
+          folderNameAnswers.folderName = options.folderName;
+         }
+      }
+    }
+  
+    try {
+      fs.accessSync(`./${folderNameAnswers.folderName}`, fs.constants.F_OK);
+  
+      let equalToAtLeastOneFolder;
+  
+      do {
+        equalToAtLeastOneFolder = rootDirContent.some(content => {
+          return content === folderNameAnswers.folderName;
+        });
+  
+        if (equalToAtLeastOneFolder === true) {
+          if (folderNameAnswers.folderName !== '') {
+            console.log( `Folder name ${chalk.green(`${folderNameAnswers.folderName}`)} already exists` );
+          } else {
+            console.log( `${chalk.yellowBright(`Folder name cannot be empty`)}` );
+          }
+          folderQuestions.push({
+            type: 'input',
+            name: 'folderName',
+            message: 'Enter different folder name:',
+          });
+          if (options.folderName) {
+            folderNameAnswers = await inquirer.prompt(folderQuestions);
+          } else {
+            folderNameAnswers = await inquirer.prompt([folderQuestions[1]]);
+          }
+        }
+      } while (equalToAtLeastOneFolder === true);
+  
+    } catch (err) {
+      if (err) {
+        //Dummy if statement to prevent: unhandledPromiseRejectionWarning in console
+      }
+    }
+  
+    //Note: This affects only the try block of the previous if (options.folderName && !options.skipPrompts) statement
+    if (options.folderName && !options.skipPrompts) {
+      options.folderName = folderNameAnswers.folderName;
+    } //------------------------------------------------
+    
+    if (options.folderName && options.skipPrompts) {
+      let matchFolderNameArg = rootDirContent.some(content => {
+        return content === options.folderName;
+      });
+
+      if (matchFolderNameArg) {
+        options.folderName = incrementFolderName();
+      }
+    }
+  
+    return [options, folderNameAnswers, defaultFolderName];
+}
\ No newline at end of file
diff --git a/src/prompts/template.js b/src/prompts/template.js
new file mode 100644
index 0000000..fc5833b
--- /dev/null
+++ b/src/prompts/template.js
@@ -0,0 +1,70 @@
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+
+let skipPromptsModified = (options, defaultFolderName, notAmongTemplateCollection, defaultTemplate) => {
+  if (notAmongTemplateCollection && (options.template !== undefined || options.template === undefined)) {
+    options.template = defaultTemplate;
+  }
+
+  options = {
+    ...options,
+    folderName: options.folderName || defaultFolderName,
+    template: options.template,
+    runInstall: false,
+    git: false
+  }
+
+  return options;
+}
+
+export const templateMissingOptionPrompt = async (options, folderNameAnswers, defaultFolderName) => {
+  const defaultTemplate = 'esm';
+  const templateQuestions = [];
+  const templateCollection = [defaultTemplate, 'cjs'];
+
+  const equalToAtLeastOneTemplate = templateCollection.some(tc => {
+    return tc === options.template;
+  });
+
+  const notAmongTemplateCollection = equalToAtLeastOneTemplate === false;
+
+  if (notAmongTemplateCollection && options.template !== undefined && !options.skipPrompts) console.log(`${chalk.redBright(`${options.template}`)} is not in the node-mongo template collection`);
+
+  if (!options.template || notAmongTemplateCollection) {
+    templateQuestions.push({
+      type: 'list',
+      name: 'template',
+      message: 'Please choose which node-mongo template kit to use',
+      choices: templateCollection,
+      default: defaultTemplate
+    });
+  }
+
+  let templateAnswers;
+
+  if (options.skipPrompts) {
+    options = skipPromptsModified(options, defaultFolderName, notAmongTemplateCollection, defaultTemplate);
+    templateQuestions.template = defaultTemplate;
+    templateAnswers = templateQuestions;
+  }
+
+  if (!options.skipPrompts) templateAnswers = await inquirer.prompt(templateQuestions);
+
+  if (notAmongTemplateCollection) {
+    options = {
+      ...options,
+      folderName: options.folderName || folderNameAnswers.folderName,
+      template: templateAnswers.template,
+      git: options.git
+    }
+  }
+
+  options = {
+    ...options,
+    folderName: options.folderName || folderNameAnswers.folderName,
+    template: options.template || templateAnswers.template,
+    git: options.git
+  }
+
+  return options;
+}
\ No newline at end of file
diff --git a/templates/cjs/.editorconfig b/templates/cjs/.editorconfig
new file mode 100644
index 0000000..1c8f4c8
--- /dev/null
+++ b/templates/cjs/.editorconfig
@@ -0,0 +1,17 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+end_of_line = lf
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+# max_line_length = off
+trim_trailing_whitespace = true
diff --git a/templates/cjs/.eslintrc.json b/templates/cjs/.eslintrc.json
new file mode 100644
index 0000000..415ac3b
--- /dev/null
+++ b/templates/cjs/.eslintrc.json
@@ -0,0 +1,19 @@
+{
+  "root": true,
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/warnings",
+    "plugin:import/warnings"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module"
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "no-console": 1
+  }
+}
diff --git a/templates/cjs/.gitignore b/templates/cjs/.gitignore
new file mode 100644
index 0000000..f4e484f
--- /dev/null
+++ b/templates/cjs/.gitignore
@@ -0,0 +1,49 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+#.env file
+.env
+
+# dependencies
+/node_modules
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/templates/cjs/LICENCE b/templates/cjs/LICENCE
new file mode 100644
index 0000000..296ddc4
--- /dev/null
+++ b/templates/cjs/LICENCE
@@ -0,0 +1,19 @@
+ISC License (ISC)
+
+Copyright 2021 Obiagba Mary | Code Collabo Community
+
+Permission to use, copy, modify, and/or distribute 
+this software for any purpose with or without fee 
+is hereby granted, provided that the above copyright 
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR 
+DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE 
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF 
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/templates/cjs/README.md b/templates/cjs/README.md
new file mode 100644
index 0000000..c33dc45
--- /dev/null
+++ b/templates/cjs/README.md
@@ -0,0 +1,24 @@
+# Readme
+
+This project was generated with [@code-collabo/node-mongo-cli](https://code-collabo.gitbook.io/node-mongo/) version 1.0.0.
+
+## Development server
+
+For dev server, run:
+````
+npm start
+```` 
+Open up localhost port in the browser:
+````
+http://localhost:3000/
+````
+````
+http://localhost:3000/demo
+````
+
+## Further help
+
+Consult the [node-mongo documentation](https://code-collabo.gitbook.io/node-mongo/) and/or use the help command:
+````
+node-mongo --help
+````
diff --git a/templates/cjs/package.json b/templates/cjs/package.json
index 0f85c98..2167a5d 100644
--- a/templates/cjs/package.json
+++ b/templates/cjs/package.json
@@ -1,15 +1,31 @@
 {
-    "name": "cjs-template",
-    "version": "1.0.0",
-    "description": "",
-    "main": "src/index.js",
-    "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "keywords": [],
-    "author": "Brent Schooley",
-    "license": "ISC",
-    "dependencies": {
-      "esm": "^3.2.25"
-    }
+  "name": "node-mongo-cjs-kit",
+  "version": "1.0.0",
+  "description": "Node js, express & mongoDB boilerplate template - the common js template.",
+  "main": "src/server.js",
+  "scripts": {
+    "prestart": "node src/startMessage.js",
+    "start": "nodemon --exec npm-run-all --parallel open:src lint:watch",
+    "open:src": "node src/server.js",
+    "lint": "esw src --color",
+    "lint:watch": "npm run lint -- --watch"
+  },
+  "author": "Obiagba Mary | Code Collabo Community",
+  "license": "ISC",
+  "dependencies": {
+    "cors": "^2.8.5",
+    "dotenv": "^10.0.0",
+    "express": "^4.17.1",
+    "mongoose": "^5.11.15",
+    "morgan": "^1.10.0"
+  },
+  "devDependencies": {
+    "chalk": "^4.1.0",
+    "eslint": "^7.20.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-watch": "^7.0.0",
+    "nodemon": "^2.0.7",
+    "npm-run-all": "^4.1.5",
+    "open": "^7.4.2"
   }
+}
diff --git a/templates/cjs/src/api/controllers/appController.js b/templates/cjs/src/api/controllers/appController.js
new file mode 100644
index 0000000..118b1c2
--- /dev/null
+++ b/templates/cjs/src/api/controllers/appController.js
@@ -0,0 +1,15 @@
+const express = require('express');
+const chalk = require('chalk');
+
+let router = express.Router();
+
+/* eslint-disable no-console */
+
+router.get('/', (req, res) => {//eslint-disable-line no-unused-vars
+  res.status(200).json({
+    message: 'App works!'
+  });
+  console.log( chalk.greenBright('\nApp works! \n\nRunning at http://localhost:3000/\n') );
+});
+
+module.exports = router;
diff --git a/templates/cjs/src/api/controllers/demoController.js b/templates/cjs/src/api/controllers/demoController.js
new file mode 100644
index 0000000..55e5e6a
--- /dev/null
+++ b/templates/cjs/src/api/controllers/demoController.js
@@ -0,0 +1,202 @@
+const express = require('express');
+let Demo = require('../models/demo');
+const chalk = require('chalk');
+
+let router = express.Router();
+
+/* eslint-disable no-console */
+/* eslint-disable no-unused-vars */
+let ObjectId = require('mongoose').Types.ObjectId;
+
+let routeName = 'demo';
+let item = `${routeName}-item`;
+
+/*======================
+  operations for /demo
+=======================*/
+
+router.get('/', (req, res) => {
+  Demo.find()
+  .select('_id name age')
+  .exec()
+  .then(docs => {
+    const response = {
+      count: docs.length,
+      items: docs.map(doc => {
+        return {
+          _id: doc._id,
+          name: doc.name,
+          age: doc.age,
+          request: {
+            type: 'GET',
+            url: `http://localhost:3000/${routeName}/${doc._id}`
+          }
+        }
+      })
+    };
+    res.status(200).json(response);
+    console.log( chalk.greenBright(`\nGET request successful! \n\nRunning at http://localhost:3000/${routeName}/\n`) );
+  })
+  .catch(err => {
+    res.status(500).json({
+        error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError retriving ${item}s: ${err}\n`) );
+  });
+});
+
+router.post('/', (req, res) => {
+  let demo = new Demo({
+    name: req.body.name,
+    age: req.body.age
+  });
+
+  demo.save()
+  .then(doc => {
+    res.status(201).json({
+      message: `${item} created successfully!`,
+      newItem: {
+        _id: doc._id,
+        name: doc.name,
+        age: doc.age,
+        request: {
+          type: 'GET',
+          url: `http://localhost:3000/${routeName}/${doc._id}`
+        }
+      }
+    });
+    console.log( chalk.greenBright(`\n${item} CREATED successfully! \n\nCreated ${item} url: http://localhost:3000/${routeName}/${doc._id}\n`) );
+  })
+  .catch(err => {
+    res.status(500).json({
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError saving ${item}: ${err}\n`) );
+  });
+});
+
+
+/*=============================
+  operations for /demo/demoId
+==============================*/
+
+router.get('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  Demo.findById(id)
+  .select('_id name age')
+  .exec()
+  .then(doc => {
+    if (doc) {
+      res.status(200).json({
+        _id: doc._id,
+        name: doc.name,
+        age: doc.age,
+        request: {
+          type: 'GET',
+          description: `Url link to all ${item}s`,
+          url: `http://localhost:3000/${routeName}/`
+        }
+      });
+      console.log( chalk.greenBright(`\nGET request successful! \n\n${item} url: http://localhost:3000/${routeName}/${doc._id}\n`) );
+    }else {
+      console.log( chalk.redBright('\nNo record found for provided ID\n') );
+      return res.status(404).json({
+        message: 'No record found for provided ID'
+      });
+    }
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: 'Invalid ID',
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError retriving ${item}: ${err}\n`) );
+  });
+});
+
+router.patch('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  const updateOps = {};
+  for  (const ops of req.body) {
+      updateOps[ops.propName] = ops.value;
+  }
+  Demo.updateOne({_id: id}, { $set: updateOps })
+  .exec()
+  .then(() => {
+    console.log( chalk.greenBright(`\nPATCH request for ID ${id} successful! \n\nUpdated ${item} url: http://localhost:3000/${routeName}/${id}\n`) );
+    return res.status(200).json({
+      message: 'Patch request successful!',
+      request: {
+        type: 'GET',
+        description: `Url link to updated ${item}`,
+        url: `http://localhost:3000/${routeName}/${id}`
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error updating ${item} property & value`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError updating ${item} property & value: ${err}\n`) );
+  });
+});
+
+router.put('/:id', (req, res) => {
+  let id = req.params.id;
+  let resetItem = {
+      name: req.body.name,
+      age: req.body.age
+  }
+
+  Demo.findByIdAndUpdate(id, { $set: resetItem }, { new: true })
+  .exec()
+  .then(response => {
+    console.log( chalk.greenBright(`\nPUT request for ID ${response._id} successful! \n\nUpdated ${item} url: http://localhost:3000/${routeName}/${id}\n`) );
+    return res.status(200).json({
+      message: `Put request successful!`,
+      request: {
+        type: 'GET',
+        description: `Url link to updated ${item}`,
+        url: `http://localhost:3000/${routeName}/${id}`
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error updating ${item}`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError updating ${item}: ${err}\n`) );
+  });
+});
+
+router.delete('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  Demo.deleteOne({_id: id})
+  .exec()
+  .then(doc => {
+    console.log( chalk.greenBright(`\n${item} DELETED successfully!\n`) );
+    res.status(200).json({
+      message: `${item} deleted successfully!`,
+      request: {
+        type: 'POST',
+        description: 'Url link to make post request to',
+        url: `http://localhost:3000/${item}/`,
+        body: {
+          name: 'String',
+          age: 'Number'
+        }
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error deleting ${item}`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError deleting ${item}: ${err}\n`) );
+  });
+});
+
+module.exports = router;
diff --git a/templates/cjs/src/api/models/demo.js b/templates/cjs/src/api/models/demo.js
new file mode 100644
index 0000000..3a23bb5
--- /dev/null
+++ b/templates/cjs/src/api/models/demo.js
@@ -0,0 +1,10 @@
+const mongoose = require('mongoose');
+
+let collectionName = 'demo';
+
+const DemoSchema = mongoose.Schema({
+  name: { type: String, required: true },
+  age: { type: Number, required: true }
+});
+
+module.exports = mongoose.model(collectionName, DemoSchema, collectionName); //declare collection name a second time to prevent mongoose from pluralizing or adding 's' to the collection name
diff --git a/templates/cjs/src/app.js b/templates/cjs/src/app.js
new file mode 100644
index 0000000..1d29b1f
--- /dev/null
+++ b/templates/cjs/src/app.js
@@ -0,0 +1,40 @@
+const express = require('express');
+const morgan = require('morgan');
+const cors = require('cors');
+let appController = require('./api/controllers/appController');
+let demoController = require('./api/controllers/demoController');
+
+//===== Installed mongoDB's db =======
+const mongoose = require('./db'); //eslint-disable-line no-unused-vars
+
+//===== MongoDB ATLAS db =======
+//const mongoose = require('./atlas/db'); //eslint-disable-line no-unused-vars
+
+const app = express();
+
+app.use(morgan('dev'));
+app.use(express.urlencoded({
+  extended: false
+}));
+app.use(express.json());
+app.use(cors({ origin: 'http://localhost:4200' }));
+
+app.use('/', appController);
+app.use('/demo', demoController);
+
+app.use((req, res, next) => {
+  const error = new Error('Route not found!');
+  error.status = 404;
+  next(error);
+});
+
+app.use((error, req, res, next) => {//eslint-disable-line no-unused-vars
+  res.status(error.status || 500);
+  res.json({
+    error: {
+      message: error.message
+    }
+  });
+});
+
+module.exports = app;
diff --git a/templates/cjs/src/atlas/db.js b/templates/cjs/src/atlas/db.js
new file mode 100644
index 0000000..a3201f0
--- /dev/null
+++ b/templates/cjs/src/atlas/db.js
@@ -0,0 +1,33 @@
+const mongoose = require('mongoose');
+const chalk = require('chalk');
+
+require('dotenv').config();
+
+/* eslint-disable no-console */
+
+mongoose.connect(`mongodb+srv://${process.env.USERNAME}:${process.env.PASSWORD}@${process.env.CLUSTERNAME}.mongodb.net/${process.env.DBNAME}?retryWrites=true&w=majority`, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true,
+  useFindAndModify: false
+},
+err => {
+  if (!err) {
+    console.log( chalk.greenBright('\nMongoDB ATLAS connection successful!!!\n') );
+  }
+  else {
+    console.log( chalk.redBright(`\nError in ATLAS DB connection: ${err.message} \n`) );
+    console.log( chalk.yellowBright(`To use MongoDB ATLAS option, make sure you:
+    => Have wifi/ data turned on and are connected to mongoDB atlas
+       - See https://docs.atlas.mongodb.com/getting-started/
+    => Update src > atlas > db.js with your username, password, clusterName and DBname respectively
+       - ensure you didn't mispell or include wrong details.
+
+  To use or see guide for installed mongoDB option:
+    => Comment out "const mongoose = require('./atlas/db')" in src > app.js,
+      and use "const mongoose = require('./db')" instead.
+    `
+    ) );
+  }
+});
+
+module.exports = mongoose;
diff --git a/templates/cjs/src/cjs.js b/templates/cjs/src/cjs.js
deleted file mode 100644
index 0d151e2..0000000
--- a/templates/cjs/src/cjs.js
+++ /dev/null
@@ -1 +0,0 @@
-//I'm a CJS file.
diff --git a/templates/cjs/src/db.js b/templates/cjs/src/db.js
new file mode 100644
index 0000000..9cbd5c0
--- /dev/null
+++ b/templates/cjs/src/db.js
@@ -0,0 +1,33 @@
+const mongoose = require('mongoose');
+const chalk = require('chalk');
+
+require('dotenv').config();
+
+/* eslint-disable no-console */
+
+mongoose.connect(`mongodb://localhost:27017/${process.env.DBNAME}`, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false
+},
+ err => {
+    if (!err) {
+      console.log( chalk.greenBright('\nInstalled MongoDB connection successful!!!') );
+    }
+    else {
+      console.log( chalk.redBright(`\nError in DB connection: ${err.message} \n`) );
+      console.log( chalk.yellowBright(`To use installed mongoDB option, make sure you:
+      => Have mongoDB installed & running locally
+        - See https://docs.mongodb.com/guides/server/install/
+      => Update src > nodemon.json file with your DB name
+        - ensure you didn't mispell or include wrong details.
+
+    To use or see guide for MongoDB ATLAS option:
+      => Comment out "const mongoose = require('./db')" in src > app.js,
+        and use "const mongoose = require('./atlas/db')" instead.
+      `
+    ) );
+    }
+});
+
+module.exports = mongoose;
diff --git a/templates/cjs/src/server.js b/templates/cjs/src/server.js
new file mode 100644
index 0000000..2d5fa61
--- /dev/null
+++ b/templates/cjs/src/server.js
@@ -0,0 +1,16 @@
+const http = require('http');
+const app = require('./app');
+const chalk = require('chalk');
+
+const port = process.env.PORT || 3000;
+const server = http.createServer(app);
+
+/* eslint-disable no-console */
+
+server.listen(port, () => {
+  try {
+    console.log( chalk.cyanBright(`\nServer running at http://localhost:${port}`) );
+  }catch(err) {
+    console.log(err);
+  }
+});
diff --git a/templates/cjs/src/startMessage.js b/templates/cjs/src/startMessage.js
new file mode 100644
index 0000000..32a19f6
--- /dev/null
+++ b/templates/cjs/src/startMessage.js
@@ -0,0 +1,4 @@
+const chalk = require('chalk');
+
+let projectName = 'insert-your-project-name';
+console.log( chalk.magenta(`\n${projectName} running in dev mode\n`) ); //eslint-disable-line no-console
diff --git a/templates/es6/package.json b/templates/es6/package.json
deleted file mode 100644
index 3c86dce..0000000
--- a/templates/es6/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "es6-template",
-    "version": "1.0.0",
-    "description": "",
-    "main": "src/index.js",
-    "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "keywords": [],
-    "author": "Brent Schooley",
-    "license": "ISC",
-    "dependencies": {
-      "esm": "^3.2.25"
-    }
-  }
diff --git a/templates/es6/src/es6.js b/templates/es6/src/es6.js
deleted file mode 100644
index 09abc6e..0000000
--- a/templates/es6/src/es6.js
+++ /dev/null
@@ -1 +0,0 @@
-//I'm a ES6 file.
diff --git a/templates/esm/.babelrc b/templates/esm/.babelrc
new file mode 100644
index 0000000..a29ac99
--- /dev/null
+++ b/templates/esm/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "@babel/preset-env"
+  ]
+}
diff --git a/templates/esm/.editorconfig b/templates/esm/.editorconfig
new file mode 100644
index 0000000..1c8f4c8
--- /dev/null
+++ b/templates/esm/.editorconfig
@@ -0,0 +1,17 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+end_of_line = lf
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+# max_line_length = off
+trim_trailing_whitespace = true
diff --git a/templates/esm/.eslintrc.json b/templates/esm/.eslintrc.json
new file mode 100644
index 0000000..e9940bf
--- /dev/null
+++ b/templates/esm/.eslintrc.json
@@ -0,0 +1,20 @@
+{
+  "root": true,
+  "parser": "@babel/eslint-parser",
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/warnings",
+    "plugin:import/warnings"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module"
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "no-console": 1
+  }
+}
diff --git a/templates/esm/.gitignore b/templates/esm/.gitignore
new file mode 100644
index 0000000..f4e484f
--- /dev/null
+++ b/templates/esm/.gitignore
@@ -0,0 +1,49 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+#.env file
+.env
+
+# dependencies
+/node_modules
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/templates/esm/LICENCE b/templates/esm/LICENCE
new file mode 100644
index 0000000..296ddc4
--- /dev/null
+++ b/templates/esm/LICENCE
@@ -0,0 +1,19 @@
+ISC License (ISC)
+
+Copyright 2021 Obiagba Mary | Code Collabo Community
+
+Permission to use, copy, modify, and/or distribute 
+this software for any purpose with or without fee 
+is hereby granted, provided that the above copyright 
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR 
+DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE 
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF 
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/templates/esm/README.md b/templates/esm/README.md
new file mode 100644
index 0000000..c33dc45
--- /dev/null
+++ b/templates/esm/README.md
@@ -0,0 +1,24 @@
+# Readme
+
+This project was generated with [@code-collabo/node-mongo-cli](https://code-collabo.gitbook.io/node-mongo/) version 1.0.0.
+
+## Development server
+
+For dev server, run:
+````
+npm start
+```` 
+Open up localhost port in the browser:
+````
+http://localhost:3000/
+````
+````
+http://localhost:3000/demo
+````
+
+## Further help
+
+Consult the [node-mongo documentation](https://code-collabo.gitbook.io/node-mongo/) and/or use the help command:
+````
+node-mongo --help
+````
diff --git a/templates/esm/package.json b/templates/esm/package.json
new file mode 100644
index 0000000..7ef519d
--- /dev/null
+++ b/templates/esm/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "node-mongo-esm-kit",
+  "version": "1.0.0",
+  "description": "Node js, express & mongoDB boilerplate template - the ES modules template.",
+  "main": "src/server.js",
+  "scripts": {
+    "prestart": "babel-node src/startMessage.js",
+    "start": "nodemon --exec npm-run-all --parallel open:src lint:watch",
+    "open:src": "babel-node src/server.js",
+    "lint": "esw src --color",
+    "lint:watch": "npm run lint -- --watch"
+  },
+  "author": "Obiagba Mary | Code Collabo Community",
+  "license": "ISC",
+  "dependencies": {
+    "cors": "^2.8.5",
+    "dotenv": "^10.0.0",
+    "express": "^4.17.1",
+    "mongoose": "^5.11.15",
+    "morgan": "^1.10.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.13.10",
+    "@babel/core": "^7.13.10",
+    "@babel/eslint-parser": "^7.13.10",
+    "@babel/node": "^7.13.10",
+    "@babel/preset-env": "^7.13.10",
+    "chalk": "^4.1.0",
+    "eslint": "^7.20.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-watch": "^7.0.0",
+    "nodemon": "^2.0.7",
+    "npm-run-all": "^4.1.5",
+    "open": "^7.4.2"
+  }
+}
diff --git a/templates/esm/src/api/controllers/appController.js b/templates/esm/src/api/controllers/appController.js
new file mode 100644
index 0000000..a710a64
--- /dev/null
+++ b/templates/esm/src/api/controllers/appController.js
@@ -0,0 +1,15 @@
+import express from 'express';
+import chalk from 'chalk';
+
+let router = express.Router();
+
+/* eslint-disable no-console */
+
+router.get('/', (req, res) => {//eslint-disable-line no-unused-vars
+  res.status(200).json({
+    message: 'App works!'
+  });
+  console.log( chalk.greenBright('\nApp works! \n\nRunning at http://localhost:3000/\n') );
+});
+
+export { router };
diff --git a/templates/esm/src/api/controllers/demoController.js b/templates/esm/src/api/controllers/demoController.js
new file mode 100644
index 0000000..0899ca7
--- /dev/null
+++ b/templates/esm/src/api/controllers/demoController.js
@@ -0,0 +1,203 @@
+import express from 'express';
+import mongoose from 'mongoose';
+import { DemoModel as Demo } from '../models/demo';
+import chalk from 'chalk';
+
+let router = express.Router();
+
+/* eslint-disable no-console */
+/* eslint-disable no-unused-vars */
+let ObjectId = mongoose.Types.ObjectId;
+
+let routeName = 'demo';
+let item = `${routeName}-item`;
+
+/*======================
+  operations for /demo
+=======================*/
+
+router.get('/', (req, res) => {
+  Demo.find()
+  .select('_id name age')
+  .exec()
+  .then(docs => {
+    const response = {
+      count: docs.length,
+      items: docs.map(doc => {
+        return {
+          _id: doc._id,
+          name: doc.name,
+          age: doc.age,
+          request: {
+            type: 'GET',
+            url: `http://localhost:3000/${routeName}/${doc._id}`
+          }
+        }
+      })
+    };
+    res.status(200).json(response);
+    console.log( chalk.greenBright(`\nGET request successful! \n\nRunning at http://localhost:3000/${routeName}/\n`) );
+  })
+  .catch(err => {
+    res.status(500).json({
+        error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError retriving ${item}s: ${err}\n`) );
+  });
+});
+
+router.post('/', (req, res) => {
+  let demo = new Demo({
+    name: req.body.name,
+    age: req.body.age
+  });
+
+  demo.save()
+  .then(doc => {
+    res.status(201).json({
+      message: `${item} created successfully!`,
+      newItem: {
+        _id: doc._id,
+        name: doc.name,
+        age: doc.age,
+        request: {
+          type: 'GET',
+          url: `http://localhost:3000/${routeName}/${doc._id}`
+        }
+      }
+    });
+    console.log( chalk.greenBright(`\n${item} CREATED successfully! \n\nCreated ${item} url: http://localhost:3000/${routeName}/${doc._id}\n`) );
+  })
+  .catch(err => {
+    res.status(500).json({
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError saving ${item}: ${err}\n`) );
+  });
+});
+
+
+/*=============================
+  operations for /demo/demoId
+==============================*/
+
+router.get('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  Demo.findById(id)
+  .select('_id name age')
+  .exec()
+  .then(doc => {
+    if (doc) {
+      res.status(200).json({
+        _id: doc._id,
+        name: doc.name,
+        age: doc.age,
+        request: {
+          type: 'GET',
+          description: `Url link to all ${item}s`,
+          url: `http://localhost:3000/${routeName}/`
+        }
+      });
+      console.log( chalk.greenBright(`\nGET request successful! \n\n${item} url: http://localhost:3000/${routeName}/${doc._id}\n`) );
+    }else {
+      console.log( chalk.redBright('\nNo record found for provided ID\n') );
+      return res.status(404).json({
+        message: 'No record found for provided ID'
+      });
+    }
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: 'Invalid ID',
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError retriving ${item}: ${err}\n`) );
+  });
+});
+
+router.patch('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  const updateOps = {};
+  for  (const ops of req.body) {
+      updateOps[ops.propName] = ops.value;
+  }
+  Demo.updateOne({_id: id}, { $set: updateOps })
+  .exec()
+  .then(() => {
+    console.log( chalk.greenBright(`\nPATCH request for ID ${id} successful! \n\nUpdated ${item} url: http://localhost:3000/${routeName}/${id}\n`) );
+    return res.status(200).json({
+      message: 'Patch request successful!',
+      request: {
+        type: 'GET',
+        description: `Url link to updated ${item}`,
+        url: `http://localhost:3000/${routeName}/${id}`
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error updating ${item} property & value`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError updating ${item} property & value: ${err}\n`) );
+  });
+});
+
+router.put('/:id', (req, res) => {
+  let id = req.params.id;
+  let resetItem = {
+      name: req.body.name,
+      age: req.body.age
+  }
+
+  Demo.findByIdAndUpdate(id, { $set: resetItem }, { new: true })
+  .exec()
+  .then(response => {
+    console.log( chalk.greenBright(`\nPUT request for ID ${response._id} successful! \n\nUpdated ${item} url: http://localhost:3000/${routeName}/${id}\n`) );
+    return res.status(200).json({
+      message: `Put request successful!`,
+      request: {
+        type: 'GET',
+        description: `Url link to updated ${item}`,
+        url: `http://localhost:3000/${routeName}/${id}`
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error updating ${item}`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError updating ${item}: ${err}\n`) );
+  });
+});
+
+router.delete('/:demoId', (req, res, next) => {
+  const id = req.params.demoId;
+  Demo.deleteOne({_id: id})
+  .exec()
+  .then(doc => {
+    console.log( chalk.greenBright(`\n${item} DELETED successfully!\n`) );
+    res.status(200).json({
+      message: `${item} deleted successfully!`,
+      request: {
+        type: 'POST',
+        description: 'Url link to make post request to',
+        url: `http://localhost:3000/${item}/`,
+        body: {
+          name: 'String',
+          age: 'Number'
+        }
+      }
+    });
+  })
+  .catch(err => {
+    res.status(500).json({
+      message: `Error deleting ${item}`,
+      error: `${err}`
+    });
+    console.log( chalk.redBright(`\nError deleting ${item}: ${err}\n`) );
+  });
+});
+
+export { router };
diff --git a/templates/esm/src/api/models/demo.js b/templates/esm/src/api/models/demo.js
new file mode 100644
index 0000000..0155809
--- /dev/null
+++ b/templates/esm/src/api/models/demo.js
@@ -0,0 +1,12 @@
+import mongoose from 'mongoose';
+
+let collectionName = 'demo';
+
+const DemoSchema = mongoose.Schema({
+  name: { type: String, required: true },
+  age: { type: Number, required: true }
+});
+
+let DemoModel = mongoose.model(collectionName, DemoSchema, collectionName); //declare collection name a second time to prevent mongoose from pluralizing or adding 's' to the collection name
+
+export { DemoModel };
diff --git a/templates/esm/src/app.js b/templates/esm/src/app.js
new file mode 100644
index 0000000..a28da79
--- /dev/null
+++ b/templates/esm/src/app.js
@@ -0,0 +1,40 @@
+import express from 'express';
+import morgan from 'morgan';
+import cors from 'cors';
+import { router as appController } from './api/controllers/appController';
+import { router as demoController } from './api/controllers/demoController';
+
+//===== Installed mongoDB's db =======
+import mongooseModuleExport from './db'; //eslint-disable-line no-unused-vars
+
+//===== MongoDB ATLAS db =======
+//import mongooseModuleExportAtlas from './atlas/db'; //eslint-disable-line no-unused-vars
+
+const app = express();
+
+app.use(morgan('dev'));
+app.use(express.urlencoded({
+  extended: false
+}));
+app.use(express.json());
+app.use(cors({ origin: 'http://localhost:4200' }));
+
+app.use('/', appController);
+app.use('/demo', demoController);
+
+app.use((req, res, next) => {
+  const error = new Error('Route not found!');
+  error.status = 404;
+  next(error);
+});
+
+app.use((error, req, res, next) => {//eslint-disable-line no-unused-vars
+  res.status(error.status || 500);
+  res.json({
+    error: {
+      message: error.message
+    }
+  });
+});
+
+export { app };
diff --git a/templates/esm/src/atlas/db.js b/templates/esm/src/atlas/db.js
new file mode 100644
index 0000000..d4b6371
--- /dev/null
+++ b/templates/esm/src/atlas/db.js
@@ -0,0 +1,34 @@
+import mongoose from 'mongoose';
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+/* eslint-disable no-console */
+
+mongoose.connect(`mongodb+srv://${process.env.USERNAME}:${process.env.PASSWORD}@${process.env.CLUSTERNAME}.mongodb.net/${process.env.DBNAME}?retryWrites=true&w=majority`, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true,
+  useFindAndModify: false
+},
+err => {
+  if (!err) {
+    console.log( chalk.greenBright('\nMongoDB ATLAS connection successful!!!\n') );
+  }
+  else {
+    console.log( chalk.redBright(`\nError in ATLAS DB connection: ${err.message} \n`) );
+    console.log( chalk.yellowBright(`To use MongoDB ATLAS option, make sure you:
+    => Have wifi/ data turned on and are connected to mongoDB atlas
+       - See https://docs.atlas.mongodb.com/getting-started/
+    => Update src > atlas > db.js with your username, password, clusterName and DBname respectively
+       - ensure you didn't mispell or include wrong details.
+
+  To use or see guide for installed mongoDB option:
+    => Comment out "import mongooseModuleExportAtlas from './atlas/db'" in src > app.js,
+      and use "import mongooseModuleExport from './db'" instead.
+    `
+    ) );
+  }
+});
+
+export const mongooseModuleExportAtlas = mongoose;
diff --git a/templates/esm/src/db.js b/templates/esm/src/db.js
new file mode 100644
index 0000000..c93fa1c
--- /dev/null
+++ b/templates/esm/src/db.js
@@ -0,0 +1,34 @@
+import mongoose from 'mongoose';
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+/* eslint-disable no-console */
+
+mongoose.connect(`mongodb://localhost:27017/${process.env.DBNAME}`, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false
+},
+ err => {
+    if (!err) {
+      console.log( chalk.greenBright('\nInstalled MongoDB connection successful!!!') );
+    }
+    else {
+      console.log( chalk.redBright(`\nError in DB connection: ${err.message} \n`) );
+      console.log( chalk.yellowBright(`To use installed mongoDB option, make sure you:
+      => Have mongoDB installed & running locally
+        - See https://docs.mongodb.com/guides/server/install/
+      => Update src > nodemon.json file with your DB name
+        - ensure you didn't mispell or include wrong details.
+
+    To use or see guide for MongoDB ATLAS option:
+      => Comment out "import mongooseModuleExport from './db'" in src > app.js,
+        and use "import mongooseModuleExportAtlas from './atlas/db'" instead.
+      `
+    ) );
+    }
+});
+
+export const mongooseModuleExport = mongoose;
diff --git a/templates/esm/src/server.js b/templates/esm/src/server.js
new file mode 100644
index 0000000..51f7530
--- /dev/null
+++ b/templates/esm/src/server.js
@@ -0,0 +1,16 @@
+import http from 'http';
+import { app as app } from './app';
+import chalk from 'chalk';
+
+const port = process.env.PORT || 3000;
+const server = http.createServer(app);
+
+/* eslint-disable no-console */
+
+server.listen(port, () => {
+  try {
+    console.log( chalk.cyanBright(`\nServer running at http://localhost:${port}`) );
+  }catch(err) {
+    console.log(err);
+  }
+});
diff --git a/templates/esm/src/startMessage.js b/templates/esm/src/startMessage.js
new file mode 100644
index 0000000..268663c
--- /dev/null
+++ b/templates/esm/src/startMessage.js
@@ -0,0 +1,4 @@
+import chalk from 'chalk';
+
+let projectName = 'insert-your-project-name';
+console.log( chalk.magenta(`\n${projectName} running in dev mode\n`) ); //eslint-disable-line no-console
diff --git a/templates/ts-es6/package.json b/templates/ts-es6/package.json
deleted file mode 100644
index ed450ae..0000000
--- a/templates/ts-es6/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "ts-template",
-    "version": "1.0.0",
-    "description": "",
-    "main": "src/index.js",
-    "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "keywords": [],
-    "author": "Brent Schooley",
-    "license": "ISC",
-    "dependencies": {
-      "esm": "^3.2.25"
-    }
-  }
diff --git a/templates/ts-es6/src/ts-es6.js b/templates/ts-es6/src/ts-es6.js
deleted file mode 100644
index e33cb69..0000000
--- a/templates/ts-es6/src/ts-es6.js
+++ /dev/null
@@ -1 +0,0 @@
-//I'm a TS file.