diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..b7a363897
Binary files /dev/null and b/.DS_Store differ
diff --git a/.env b/.env
new file mode 100644
index 000000000..b2474ff93
--- /dev/null
+++ b/.env
@@ -0,0 +1,6 @@
+KEY1="eieduaiduiiid"
+KEY2="3777dasdyy231"
+PORT=3000
+MONGO_DB_URI="mongodb+srv://templarenoch:v7DBhNxLPUUY721U@dacluster.pqwgabo.mongodb.net/?retryWrites=true&w=majority"
+GITHUB_CLIENT_ID="51f224cba83f6277d42f"
+GITHUB_SECRET="e593b3a6024251fe30623ba58614c025aef628ce"
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..b58b603fe
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/Assignment 3 Webware.iml b/.idea/Assignment 3 Webware.iml
new file mode 100644
index 000000000..ddfa7d9d9
--- /dev/null
+++ b/.idea/Assignment 3 Webware.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 000000000..b84383514
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..e1853460c
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..94a25f7f4
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 1ba2c7a4c..306c46ef9 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1,50 @@
-Assignment 3 - Persistence: Two-tier Web Application with Database, Express server, and CSS template
+TDEE Calculator
===
+## by Enoch Zhao
-Due: September 22nd, by 11:59 AM.
+Website link: https://tdeecalculator.herokuapp.com/
-This assignnment continues where we left off, extending it to use the most popular Node.js server framework (express),
-a database (mongodb), and a CSS application framework / template of your choice (Boostrap, Material Design, Semantic UI, Pure etc.)
+There is an existing test account should you not wish to create a new account. The username and password are:
-Baseline Requirements
----
+Username: cs4241
-Your application is required to implement the following functionalities:
+Password: 123123
-- a `Server`, created using Express (no alternatives will be accepted for this assignment)
-- a `Results` functionality which shows all data associated with a logged in user (except passwords)
-- a `Form/Entry` functionality which allows users to add, modify, and delete data items (must be all three!) associated with their user name / account.
-- Use of at least five [Express middleware packages](https://expressjs.com/en/resources/middleware.html). Explore! One of these five middleware
-can be a custom function that you write yourself; if you choose to do this, make sure to describe what this function is in your README.
-- Persistent data storage in between server sessions using [mongodb](https://www.mongodb.com/cloud/atlas)
-- Use of a [CSS framework or template](https://github.com/troxler/awesome-css-frameworks).
-This should do the bulk of your styling/CSS for you and be appropriate to your application.
-For example, don't use [NES.css](https://nostalgic-css.github.io/NES.css/) (which is awesome!) unless you're creating a game or some type of retro 80s site.
+*These details are also provided on the site within the login forms.
-Your application is required to demonstrate the use of the following concepts:
-
-HTML:
-- HTML input tags and form fields of various flavors (`