diff --git a/README.md b/README.md
index f191a71..26410d4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.com/Labs-EU4/lambda-door-server.svg?branch=develop)](https://travis-ci.com/Labs-EU4/lambda-door-server)
 [![Coverage Status](https://coveralls.io/repos/github/Labs-EU4/lambda-door-server/badge.svg?branch=develop)](https://coveralls.io/github/Labs-EU4/lambda-door-server?branch=develop)
 
-<!-- ### About
+### About
 
 The one-stop portal for Lambda graduates looking for company information in the quest for a job.
 
@@ -12,14 +12,34 @@ The one-stop portal for Lambda graduates looking for company information in the
 - View and post interview reviews
 - View and post salary reviews
 - View and post work culture reviews
+- In-app chat with other reviewers
+- Email notification for unread chats
+
 
 ### Application Links
 
-### [Product Vision Document](https://www.notion.so/EU3-Lambda-Door-e78fd9396061487b8b458a28912d66c4)
+### [Product Vision Document](https://www.notion.so/EU4-Lambda-Door-11340785bab24a1c8ec3e5fcaec72e8f)
+
+### [API Link](https://lambdadoor-labseu4.herokuapp.com/)
+
+### [Trello board](https://trello.com/b/EQoZOK3D/lambda-door-eu4)
+
+## Team
 
-### [API Link](https://lambdadoor.herokuapp.com/)
+|                                               **[Colin Toft](http://colintoft.dev/)**                                                |                                     **[Olamide Oredola](https://github.com/ola-dola)**                                      |                                          **[Evans Ibok](http://evansibok.com)**                                          |                                    **[Rodrigo Gracia](http://portfolio.rodrigograca.com/)**                                    |
+| :----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------: |
+|                                                          Backend Developer                                                         |                                                     Backend Developer                                                     |                                                    Backend Developer                                                   |                                                       Backend Developer                                                      |
+|       [<img src="https://ca.slack-edge.com/T4JUEB3ME-UNM9CA6NS-ae583a3c9f79-512" width="200" />](https://github.com/cappers86)       |   [<img src="https://ca.slack-edge.com/T4JUEB3ME-UM3NF5BTQ-f7cf3f2c495e-512" width="200" />](https://github.com/ola-dola)   | [<img src="https://ca.slack-edge.com/T4JUEB3ME-ULW170LKF-b68116040dbd-512" width="200" />](https://github.com/evansibok) | [<img src="https://ca.slack-edge.com/T4JUEB3ME-UNM9C9G4W-gb34f66f0b1d-512" width="200" />](https://github.com/rodrigograca31)  |
+|                        [<img src="https://github.com/favicon.ico" width="20"> ](https://github.com/cappers86)                        |                    [<img src="https://github.com/favicon.ico" width="20"> ](https://github.com/ola-dola)                    |                  [<img src="https://github.com/favicon.ico" width="20"> ](https://github.com/evansibok)                  |                  [<img src="https://github.com/favicon.ico" width="20"> ](https://github.com/rodrigograca31)                   |
+| [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="20"> ](https://www.linkedin.com/in/colin-toft-41975518a) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="20"> ](https://www.linkedin.com/in/ola-oredola) |  [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="20"> ](https://linkedin.com/in/evansibok)   | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="20"> ](https://www.linkedin.com/in/rodrigograca31) |
+
+|                                      **[Alexander Oguejiofor](https://github.com/kip-guile)**                                       |
+| :---------------------------------------------------------------------------------------------------------------------------------: |
+|                                                              Team Lead                                                              |
+|      [ <img src="https://ca.slack-edge.com/T4JUEB3ME-UM150T4TZ-d6a8275db0f5-512" width="200"> ](https://github.com/kip-guile)       |
+|                       [<img src="https://github.com/favicon.ico" width="20"> ](https://github.com/kip-guile)                        |
+| [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="20"> ](https://www.linkedin.com/in/alexanderoguejiofor) |
 
-### [Trello board](https://trello.com/b/YdfO1w9X/lambda-door)
 
 ### NPM Scripts
 
@@ -28,25 +48,29 @@ To get the server running locally:
 - Clone this repo
 - **npm install** to install all required dependencies
 - **npm run server** to start the local server
-- **npm test** to start server using testing environment
+- **npm run test** to start server using testing environment
 - **npm run migrate** to migrate the tables
 - **npm run seed** to seed the tables
 - **npm run rollback** to rollback all tables
+- **npm run email** to notify users of unread chats
 
-## Technologies
+## Environment Variables
 
-[NodeJS](https://nodejs.org/en/) - is a JavaScript runtime built on Chrome's V8 JavaScript engine.
+In order for the app to function correctly, the user must set up their own environment variables.
 
-The [**Express.js**](https://expressjs.com/) backend framework was used to build the server. Fast, unopinionated, minimalist web framework for Node.js
+Create a .env file that includes the following:
 
-[Sentry](https://sentry.io/) - An exception monitoring tool used to track and resolve errors with the app.
+- PORT: The port the server will start on.
+- DATABASE_URL: The PostgreSQL database url.
+- TESTING_DB: Test PostgreSQL database url.
+- ACCESS_TOKEN_SECRET: A string to use as JWT salt.
+- EMAIL_PASSWORD: Password for nodemailer email.
+- FIREBASE_PRIVATE_KEY_BASE64: Firebase Private PGP Key encoded in base64
+- FIREBASE_PRIVATE_KEY_PRODUCTION: Firebase Private PGP Key - Production
 
-#### Why Express.js
+## Technologies Used
 
-- Express is fast.
-- Express is efficient.
-- Express is scalable.
-- Express is a lightweight framework.
+`JAVASCRIPT`, `NODE.js`, `EXPRESS.js`, `PostgreSql`, `KNEX`, `JSONWEBTOKEN`, `FIREBASE`, `NODEMAILER`, `COVERALLS`, `SENTRY`, `TRAVIS CI`, `HEROKU`, `CRON SCHEDULER`.
 
 ## Supporting Packages
 
@@ -63,9 +87,9 @@ Test Tools
 
 ## Database Model
 
-![Lambda Door Database Illustration](database/DBIllustration.png)
+![Lambda Door Database Illustration](database/DbSchema.png)
 
-The API endpoints for the server is on Heroku and can be found [here.](https://lambdadoor.herokuapp.com/)
+The API endpoints for the server is on Heroku and can be found [here.](https://lambdadoor-labseu4.herokuapp.com/)
 
 ## USERS
 
@@ -99,7 +123,7 @@ The API endpoints for the server is on Heroku and can be found [here.](https://l
 
 ### Add a new user [POST]
 
-**URL**: _https://lambdadoor.herokuapp.com/users_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/users_
 
 **Returns**: An object containing the user credentials.
 
@@ -132,7 +156,7 @@ Input
 
 ### Edit User[PATCH]
 
-**URL**: _https://lambdadoor.herokuapp.com/users/16_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/users/16_
 
 **Returns**: An array containing an object which holds the users credentials.
 
@@ -166,7 +190,7 @@ Returns
 
 ### Get a user [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/users/16_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/users/16_
 
 **Returns**: An object with the user details
 
@@ -205,7 +229,7 @@ Returns
 
 ### Get all interests [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests_
 
 **Returns**: An Array with interest listed in the database
 
@@ -248,7 +272,7 @@ Returns
 
 ### Get a single interest by ID [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests/:id_
 
 **Returns**: An object of a chosen interest.
 
@@ -261,7 +285,7 @@ Returns
 
 ### Get user's interests [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests/user/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests/user/:id_
 
 **Returns**: An array of all interest of the user .
 
@@ -287,7 +311,7 @@ Returns
 
 ### Get interests [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests/ui/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests/ui/:id_
 
 **Returns**: An object of interest with the name of the interest and the interest id linked to the user.
 
@@ -302,9 +326,9 @@ Returns
 
 ### Post User interest [POST]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests/_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests/_
 
-**Reaturn**: An array of the users intersts along with the new addition.
+**Return**: An array of the users intersts along with the new addition.
 
 Input
 
@@ -332,11 +356,11 @@ Output
 ];
 ```
 
-### delete User interest [DELETE]
+### Delete User interest [DELETE]
 
-**URL**: _https://lambdadoor.herokuapp.com/interests/_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interests/_
 
-**Reaturn**: A message os successful deletion along with an an object of the deleted interest.
+**Return**: A message os successful deletion along with an an object of the deleted interest.
 
 ```javascript
 {
@@ -386,7 +410,7 @@ Output
 
 ### Get all companies [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/companies
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/companies
 
 **Returns**: An array of companies in the db with their details and average rating
 
@@ -415,7 +439,7 @@ Returns
 
 ### Get top-rated companies [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/companies/top
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/companies/top
 
 **Returns**: An array of the five top-rated companies in the db and their average rating
 
@@ -436,7 +460,7 @@ Returns
 
 ### Get closest companies to the user's location [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/companies/:id/closest
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/companies/:id/closest
 
 **Returns**: An array of the closest companies to the user's location
 
@@ -459,7 +483,7 @@ Returns
 
 ### Get a company by Id [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/companies/1_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companies/1_
 
 **Returns**: An object which holds the company details and average rating
 
@@ -482,7 +506,7 @@ Returns
 
 ### Update a company Info by Id [PATCH]
 
-**URL**: _https://lambdadoor.herokuapp.com/companies/1_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companies/1_
 **Headers** : passcode = process.env.ADMIN_PREVILEGE_TOKEN
 
 **Returns**: An object which holds the company details and average rating
@@ -506,7 +530,7 @@ Returns
 
 ### Adds a new Company [POST]
 
-**URL**: \_https://lambdadoor.herokuapp.com/companies/
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/companies/
 
 **Returns**: An object containing the company that was posted
 
@@ -576,7 +600,7 @@ Returns
 
 ### Get all of the user's reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/companyreviews/user/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companyreviews/user/:id_
 
 **Returns**: An array of the user's reviews
 
@@ -602,7 +626,7 @@ Returns
 
 ### Get a review by review id [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/companyreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companyreviews/:id_
 
 **Returns**: The selected review.
 
@@ -628,7 +652,7 @@ Returns
 
 ### Update an individual review [PATCH]
 
-**URL**: _https://lambdadoor.herokuapp.com/companyreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companyreviews/:id_
 
 **Returns**: The updated review.
 
@@ -652,13 +676,13 @@ Returns
 
 ### Delete a user's review [DELETE]
 
-**URL**: _https://lambdadoor.herokuapp.com/companyreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companyreviews/:id_
 
 **Returns**: A 204 status
 
 ### Add a user's review [POST]
 
-**URL**: _https://lambdadoor.herokuapp.com/companyreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/companyreviews/:id_
 
 **Returns**: A 201 status and The added Review
 
@@ -682,7 +706,7 @@ Returns
 
 ### Get a single company's reviews [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/companyreviews/reviews/:id
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/companyreviews/reviews/:id
 
 **Returns**: An array of a selected company's various reviews.
 
@@ -738,7 +762,7 @@ Returns
 
 ### Get all salary reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews_
 
 **Returns**: An array of all salary reviews
 
@@ -764,7 +788,7 @@ Returns
 
 ### Get all of the user's salary reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews/user/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews/user/:id_
 
 **Returns**: An array of the user's salary reviews
 
@@ -789,7 +813,7 @@ Returns
 
 ### Get a salary review by review id [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews/:id_
 
 **Returns**: The selected salary review.
 
@@ -814,7 +838,7 @@ Returns
 
 ### Get the average salaries for job types for a particular company using company id [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews/avg/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews/avg/:id_
 
 **Returns**: An array of the average salaries within the company
 
@@ -839,7 +863,7 @@ Returns
 
 ### Update a single review of the user[PATCH]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews/:id_
 
 **Returns**: The updated salary review.
 
@@ -857,13 +881,13 @@ Returns
 
 ### Delete a user's salary review [DELETE]
 
-**URL**: _https://lambdadoor.herokuapp.com/salaryreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/salaryreviews/:id_
 
 **Returns**: A 204 status
 
 ### Add a user's salary review [POST]
 
-**URL**: \_https://lambdadoor.herokuapp.com/salaryreviews/
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/salaryreviews/
 
 **Returns**: A 201 status and The added Review
 
@@ -881,7 +905,7 @@ Returns
 
 ### Get a company's salary reviews [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/salaryreviews/reviews/:id
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/salaryreviews/reviews/:id
 
 **Returns**: An array of a single company's various salary reviews.
 
@@ -933,7 +957,7 @@ Returns
 
 ### Get all of the user's interview reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interviewreviews/user/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interviewreviews/user/:id_
 
 **Returns**: An array of the user's interview reviews
 
@@ -958,7 +982,7 @@ Returns
 
 ### Get an interview review by review id [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/interviewreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interviewreviews/:id_
 
 **Returns**: The selected interview review.
 
@@ -983,7 +1007,7 @@ Returns
 
 ### Update a single review of the user[PATCH]
 
-**URL**: _https://lambdadoor.herokuapp.com/interviewreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interviewreviews/:id_
 
 **Returns**: The updated interview review.
 
@@ -1003,13 +1027,13 @@ Returns
 
 ### Delete a user's interview review [DELETE]
 
-**URL**: _https://lambdadoor.herokuapp.com/interviewreviews/:id_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/interviewreviews/:id_
 
 **Returns**: A 204 status
 
 ### Add a user's interview review [POST]
 
-**URL**: \_https://lambdadoor.herokuapp.com/interviewreviews/
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/interviewreviews/
 
 **Returns**: A 201 status and The added Review
 
@@ -1024,7 +1048,7 @@ Returns
 
 ### Get a company with its interview reviews [GET]
 
-**URL**: \_https://lambdadoor.herokuapp.com/interviewreviews/reviews/:id
+**URL**: \_https://lambdadoor-labseu4.herokuapp.com/interviewreviews/reviews/:id
 
 **Returns**: An array of a single company along with its various interview reviews.
 
@@ -1075,7 +1099,7 @@ Returns
 
 ### Get all of the user's reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/dataDisplay_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/dataDisplay_
 
 **Returns**: Returns an Array of all salary reviews, grouped by interest.
 
@@ -1113,7 +1137,7 @@ Returns
 
 ### Request Refferal [POST]
 
-**URL**: _https://lambdadoor.herokuapp.com/referral_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/referral_
 
 **Returns**: Returns text that request is successful.
 
@@ -1142,7 +1166,7 @@ Returns
 
 ### Search companies [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/search/companies?search_query=acc_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/search/companies?search_query=acc_
 
 **Returns**: Returns an Array of all matching companies.
 
@@ -1169,7 +1193,7 @@ Returns
 
 ### Search salary reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/search/salaries?search_query=dev_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/search/salaries?search_query=dev_
 
 **Returns**: Returns an Array of all matching salary reviews.
 
@@ -1206,7 +1230,7 @@ Returns
 
 ### Search interview reviews [GET]
 
-**URL**: _https://lambdadoor.herokuapp.com/search/interviews?search_query=san_
+**URL**: _https://lambdadoor-labseu4.herokuapp.com/search/interviews?search_query=san_
 
 **Returns**: Returns an Array of all matching salary reviews.
 
@@ -1239,15 +1263,6 @@ Returns
 ];
 ```
 
-## Environment Variables
-
-In order for the app to function correctly, the user must set up their own environment variables.
-
-Create a .env file that includes the following:
-
-- PORT - The port the server will start on.
-- DATABASE_URL - The PostgreSQL database url.
-- ACCESS_TOKEN_SECRET - The test url.
 
 ## Contributing
 
@@ -1284,8 +1299,8 @@ Remember that this project is licensed under the MIT license, and by submitting
 
 ### Attribution
 
-These contribution guidelines have been adapted from [this good-Contributing.md-template](https://gist.github.com/PurpleBooth/b24679402957c63ec426). -->
+These contribution guidelines have been adapted from [this good-Contributing.md-template](https://gist.github.com/PurpleBooth/b24679402957c63ec426).
 
-## Documentation
+## Frontend Documentation
 
-See [Frontend Documentation](https://github.com/Labs-EU4/lambda-door-client) for details on the frontend of our project.
+See [Frontend Documentation](https://github.com/Labs-EU4/lambda-door-client) for details on the frontend of our project.
\ No newline at end of file
diff --git a/database/DBIllustration.png b/database/DBIllustration.png
deleted file mode 100644
index 68fe37b..0000000
Binary files a/database/DBIllustration.png and /dev/null differ
diff --git a/database/DbSchema.png b/database/DbSchema.png
new file mode 100644
index 0000000..d5ae6da
Binary files /dev/null and b/database/DbSchema.png differ