diff --git a/DirectReport/browserview/app.py b/DirectReport/browserview/app.py
index d025e906..0ce5a97c 100644
--- a/DirectReport/browserview/app.py
+++ b/DirectReport/browserview/app.py
@@ -1,9 +1,14 @@
 #!/usr/bin/env python3
 
 import sys
+import os
 from pathlib import Path
+import urllib
+import requests
 
-from flask import Flask, render_template, request, redirect, json, url_for
+from flask import Flask, render_template, session, request, redirect, json, url_for
+from flask import make_response
+from datetime import datetime, timedelta
 from flask_login import LoginManager, login_required, current_user
 
 from DirectReport.browserview.services.github import GithubClient
@@ -22,11 +27,147 @@
 app.register_blueprint(auth)
 app.register_blueprint(reportsbp)
 app.secret_key = appsecrets.SECRET_KEY
+
+client_id = appsecrets.GITHUB_CLIENT_ID
+client_secret = appsecrets.GITHUB_CLIENT_SECRET
+
 login_manager.init_app(app)
 login_manager.login_view = "login"
 user_model = UserModel()
 
 
+@app.route('/authorize/github')
+def oauth2_authorize():
+    github_url = "https://github.com/login/oauth/authorize?scope=user:email&client_id=" + client_id + "&client_secret=" + client_secret + "&redirect_uri=http%3A%2F%2F127.0.0.1%3A5000%2Fcallback%2Fgithub"
+    return redirect(github_url)
+
+
+def get_commits_last_month():
+    owner = 'chriswebb09'
+    repo = 'your_repository'
+    url = f'https://api.github.com/repos/{owner}/{repo}/pulls'
+
+    # Replace 'your_token' with your personal access token
+    headers = {'Authorization': 'token your_token'}
+
+    # Calculate the date one month ago
+    since_date = (datetime.utcnow() - timedelta(days=30)).strftime('%Y-%m-%dT%H:%M:%SZ')
+    params = {'state': 'all', 'sort': 'created', 'direction': 'desc', 'since': since_date}
+    response = requests.get(url, headers=headers, params=params)
+
+    if response.status_code == 200:
+        pull_requests = response.json()
+        print(pull_requests)
+    else:
+        print(f"Error: {response.status_code}")
+        print(response.text)
+
+@app.route('/repo', methods=['GET', 'POST'])
+def reponame():
+    args_url = request.args.get('repo_url')
+    h_token = session['header_token']
+    reponame = "https://api.github.com/repos/" + args_url + "/commits"
+    headers443 = {
+        'Accept': 'application/vnd.github+json',
+        'Authorization': 'Bearer ' + h_token,
+        'X-GitHub-Api-Version': '2022-11-28'
+    }
+    response3 = requests.get(
+        url=reponame,
+        headers=headers443,
+        auth=(client_id, client_secret)
+    )
+    json_Data3 = json.loads(response3.content)
+
+    USERNAME = "chriswebb09"
+    REPO = "DirectReport"
+
+    # Calculate the date one month ago
+    last_month = datetime.utcnow() - timedelta(days=30)
+    last_month_str = last_month.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    # API endpoint to retrieve commits for a repository since the last month
+    api_url = f"https://api.github.com/repos/{USERNAME}/{REPO}/commits?since={last_month_str}"
+
+    # Fetch commits using requests and your GitHub token
+    headers = {"Authorization": f"token {appsecrets.GITHUB_TOKEN}"}
+    response = requests.get(api_url, headers=headers)
+
+    # Check if the request was successful (status code 200)
+    results_2 = []
+    if response.status_code == 200:
+        commits = response.json()
+
+        # Format and print the commits
+        for commit in commits:
+            author_name = commit["commit"]["author"]["name"]
+            commit_message = commit["commit"]["message"]
+            results_2.append(f"{author_name}: {commit_message}")
+    else:
+        print(f"Error: {response.status_code} - {response.text}")
+    results = []
+    for commit in json_Data3:
+        commit_data_res = {
+            "message": commit["commit"]["message"],
+            "url": commit["commit"]["url"],
+            "commit_author_name": commit["commit"]["author"]["name"],
+            "commit_author_email": commit["commit"]["author"]["email"],
+            "commit_author_date": commit["commit"]["author"]["date"],
+            "committer_name": commit["commit"]["committer"]["name"],
+            "committer_email": commit["commit"]["committer"]["email"],
+            "committer_date": commit["commit"]["committer"]["date"],
+            "comment_count": commit["commit"]["comment_count"],
+            "verified": commit["commit"]["verification"]["verified"],
+            "verification_reason": commit["commit"]["verification"]["reason"],
+            "verification_signature": commit["commit"]["verification"]["signature"],
+            "type": "commit"
+        }
+        results.append(commit_data_res)
+    result_log = " ".join(results_2)
+    print(result_log)
+    return json_Data3, 200
+
+
+
+@app.route('/callback/github', methods=['GET', 'POST'])
+def ouath2_callback():
+    data = {'client_id': client_id, 'client_secret': client_secret, 'code': request.args.get("code")}
+    response = requests.post('https://github.com/login/oauth/access_token', data=data)
+    res = response.text.split('&', 1)
+    token = res[0].split('=')[1]
+    HEADER_TOKEN = token
+    session['header_token'] = token
+    headers2 = {
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28',
+        'Content-Type': 'application/x-www-form-urlencoded',
+    }
+    HEADER_TOKEN = token
+    data2 = '{\n' + '  "access_token": "' + HEADER_TOKEN + '" \n}'
+    response2 = requests.post(
+        url="https://api.github.com/applications/" + client_id + "/token",
+        headers=headers2,
+        data=data2,
+        auth=(client_id, client_secret),
+    )
+    json_Data = json.loads(response2.content)
+    repos = requests.get(json_Data["user"]['repos_url'] + "?sort=updated&direction=desc", data=data2, auth=(client_id, client_secret))
+    json_Data2 = json.loads(repos.content)
+    results = []
+    for repo in json_Data2:
+        owner = repo['owner']
+        url_repo = "https://api.github.com/repos/" + owner['login'] + "/" + repo['name']
+
+        data_res = {
+            "name": repo['name'],
+            "description": repo['description'],
+            "url": repo['url'],
+            'url_repo': url_repo,
+            "owner_url": owner['url']
+        }
+        results.append(data_res)
+    return render_template('team/teamreport.html', title='Team', data=results)
+
 @app.route("/")
 def home():
     """
diff --git a/DirectReport/browserview/blueprints/auth/auth.py b/DirectReport/browserview/blueprints/auth/auth.py
index fbef0c9e..31c89740 100644
--- a/DirectReport/browserview/blueprints/auth/auth.py
+++ b/DirectReport/browserview/blueprints/auth/auth.py
@@ -6,6 +6,7 @@
 from DirectReport.models.user_model import UserModel
 from flask_login import login_user, login_required, logout_user, current_user
 from DirectReport.browserview import app
+from DirectReport.datadependencies import appsecrets
 from DirectReport.models.Report.report_builder import ReportBuilder
 from DirectReport.browserview.services.github import GithubClient
 
@@ -50,7 +51,9 @@ def login():
         else:
             print("password no match")
             flash("Please check your login details and try again.")
-    return render_template('auth/login.html')
+    return render_template(
+        'auth/login.html', client_id=appsecrets.GITHUB_CLIENT_ID, client_secret=appsecrets.GITHUB_CLIENT_SECRET
+    )
 
 
 @auth.route("/account", methods=['GET', 'POST'])
diff --git a/DirectReport/browserview/blueprints/reports/reportbp.py b/DirectReport/browserview/blueprints/reports/reportbp.py
index eaa16c21..ff095ef7 100644
--- a/DirectReport/browserview/blueprints/reports/reportbp.py
+++ b/DirectReport/browserview/blueprints/reports/reportbp.py
@@ -6,8 +6,8 @@
 
 from DirectReport.browserview.services.github import GithubClient
 from DirectReport.browserview.services.github import GoogleAIClient
-from DirectReport.models.Report.report_builder import ReportBuilder
-from DirectReport.models.Report.report_model import ReportModel
+from DirectReport.models.report.report_builder import ReportBuilder
+from DirectReport.models.report.report_model import ReportModel
 
 reportsbp = Blueprint('reportsbp', __name__)
 
@@ -40,11 +40,11 @@ def report():
     }
     data_json["shortlog"] = client.parse_git_shortlog(log_item)
     data_json["repos"] = repodata
-    ReportBuilder.new(data_json, prompt, current_user.id)
+    ReportBuilder.new(data_json, prompt, current_user.id, "DirectReport")
     return data_json, 201
 
 
-@reportsbp.route("/teamreport", methods=['GET', 'POST'])
+@reportsbp.route("/reports/new", methods=['GET', 'POST'])
 @login_required
 def team_report():
     if request.method == "POST":
@@ -54,7 +54,7 @@ def team_report():
     return render_template('team/teamreport.html', title='Team Report', data=[])
 
 
-@reportsbp.route("/getreport/<uid>", methods=['GET'])
+@reportsbp.route("/reports/<uid>", methods=['GET'])
 @login_required
 def get_report(uid=None):
     reports = ReportBuilder.get_reports_for_user_id(current_user.id)
@@ -63,14 +63,14 @@ def get_report(uid=None):
     return render_template('team/teamreport.html', title='Team Report', teamData=report["report"])
 
 
-@reportsbp.route("/getlist", methods=['GET'])
+@reportsbp.route("/reports/list/new", methods=['GET'])
 @login_required
 def get_list():
     reports = ReportBuilder.get_reports_for_user_id(current_user.id)
     return reports, 201
 
 
-@reportsbp.route("/list", methods=['GET', 'POST'])
+@reportsbp.route("/reports", methods=['GET', 'POST'])
 @login_required
 def list_entries():
     """
diff --git a/DirectReport/browserview/static/js/account/account.js b/DirectReport/browserview/static/js/account/account.js
index 9d3ca3c8..f3b079b4 100644
--- a/DirectReport/browserview/static/js/account/account.js
+++ b/DirectReport/browserview/static/js/account/account.js
@@ -3,7 +3,6 @@ const { useState, useEffect } = React;
 
 const Account = () => {
     const [userData, setUserData] = useState({});
-    const [actualData, setActualData] = useState({});
     const [reportData, setReportData] = useState([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
@@ -18,10 +17,9 @@ const Account = () => {
                 }
                 return response.json();
             })
-            .then((actualData) => {
-                setUserData(actualData["user"]);
-                setReportData(actualData["reports"]);
-                setActualData(actualData);
+            .then((responseData) => {
+                setUserData(responseData["user"]);
+                setReportData(responseData["reports"]);
                 setError(null);
             })
             .catch((err) => {
@@ -39,14 +37,14 @@ const Account = () => {
         )
     } else {
         return (
-            <div className="mx-30 content-center mt-0 mb-48 h-150">
-                <div className="pt-5 pb-3 mt-0 mb-5 ml-20 px-20">
+            <div className="mx-10 content-center mt-0 mb-28 h-130">
+                <div className="pt-2 pb-3 mt-0 mb-5 ml-20 px-0">
                     <h1 className="text-2xl text-blue-800 text-left font-bold font-mono pt-5">
                         User Account
                     </h1>
                 </div>
 
-                <div className="grid grid-cols-3 gap-8 mb-1 mx-20 px-20 justify-center">
+                <div className="grid grid-cols-3 gap-8 mb-1 mx-10 px-10 justify-center">
                     {userData && AccountUserInfo(userData, reportData)}
                 </div>
             </div>
diff --git a/DirectReport/browserview/static/js/auth/login.js b/DirectReport/browserview/static/js/auth/login.js
index 0d67fb9d..da845e1a 100644
--- a/DirectReport/browserview/static/js/auth/login.js
+++ b/DirectReport/browserview/static/js/auth/login.js
@@ -18,7 +18,8 @@ const LoginForm = () => {
                                     placeholder="name@company.com" required=""/>
                          </div>
                          <div>
-                             <label htmlFor="password" className="block mb-2 text-sm font-medium text-gray-900 dark:text-white">
+                             <label htmlFor="password"
+                                    className="block mb-2 text-sm font-medium text-gray-900 dark:text-white">
                                  Password
                              </label>
                              <input type="password" name="password" id="password" placeholder="••••••••"
@@ -29,7 +30,8 @@ const LoginForm = () => {
                              <div className="flex items-start">
                                  {RememberMe()}
                              </div>
-                             <a href="#" className="text-sm font-medium text-primary-600 hover:underline dark:text-primary-500">
+                             <a href="#"
+                                className="text-sm font-medium text-primary-600 hover:underline dark:text-primary-500">
                                  Forgot password?
                              </a>
                          </div>
@@ -37,9 +39,16 @@ const LoginForm = () => {
                                  className="w-full text-white bg-indigo-700 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800">
                              Sign in
                          </button>
+                         <button
+                             className="w-80 sm:w-90 bg-slate-100 hover:bg-blue-400 text-blue-500 shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:text-white hover:border-gray-200 text-lg font-semibold py-2 px-5 rounded-2xl mt-2"
+                             type="button">
+                             <a className="btn btn-primary" href="/authorize/github">Login
+                                 with GitHub</a>
+                         </button>
                          <p className="text-sm font-light text-gray-500 dark:text-gray-400 ml-14">
                              Don’t have an account yet?
-                             <a href="/signup" className="font-medium text-primary-600 ml-3 hover:underline dark:text-primary-500">
+                             <a href="/signup"
+                                className="font-medium text-primary-600 ml-3 hover:underline dark:text-primary-500">
                                  Sign up
                              </a>
                          </p>
diff --git a/DirectReport/browserview/static/js/entryform.js b/DirectReport/browserview/static/js/entryform.js
index 1a13fbed..cdcb7cd2 100644
--- a/DirectReport/browserview/static/js/entryform.js
+++ b/DirectReport/browserview/static/js/entryform.js
@@ -1,5 +1,6 @@
 const { useState, useEffect } = React;
 
+const { axios } = axios;
 class EntryForm extends React.Component {
     constructor(props) {
         super(props);
diff --git a/DirectReport/browserview/static/js/index.js b/DirectReport/browserview/static/js/index.js
index 2b9fd073..27db1292 100644
--- a/DirectReport/browserview/static/js/index.js
+++ b/DirectReport/browserview/static/js/index.js
@@ -1,6 +1,7 @@
 'use strict';
 const elem = React.createElement;
 
+
 class Home extends React.Component {
     render() {
         return elem(
diff --git a/DirectReport/browserview/static/js/list/list.js b/DirectReport/browserview/static/js/list/list.js
index ec5c4d50..dc90f681 100644
--- a/DirectReport/browserview/static/js/list/list.js
+++ b/DirectReport/browserview/static/js/list/list.js
@@ -7,7 +7,7 @@ const SavedReportListApp = () => {
     const [error, setError] = useState(null);
 
     useEffect(() => {
-        fetch(`/getlist`)
+        fetch(`/reports/list/new`)
             .then((response) => {
                 if (!response.ok) {
                     throw new Error(
diff --git a/DirectReport/browserview/static/js/list/listcomponents.js b/DirectReport/browserview/static/js/list/listcomponents.js
index 60159903..eff84277 100644
--- a/DirectReport/browserview/static/js/list/listcomponents.js
+++ b/DirectReport/browserview/static/js/list/listcomponents.js
@@ -11,7 +11,7 @@ class SavedReportList extends React.Component {
                     {this.props.listdata.map(item =>
                         <div className="col-span-1 justify-center mt-3 mb-3">
                             <article className="mx-4 mt-2 w-90 rounded-2xl border border-gray-200 p-1 shadow-lg transition hover:shadow-xl">
-                                <a className="block rounded-xl bg-white p-1 sm:p-6 lg:p-8" href={'/getreport/' + item.uuid}>
+                                <a className="block rounded-xl bg-white p-1 sm:p-6 lg:p-8" href={'/reports/' + item.uuid}>
                                     <div className="mt-1">
                                         <h2 className="text-2xl font-bold text-gray-800 sm:text-xl">{'User: ' + item.user_id}</h2>
                                         <p className="mt-3 text-sm text-justify line-clamp-3 text-gray-500">{'Raw Input: ' + item.raw_input}</p>
diff --git a/DirectReport/browserview/static/js/teamreport/teammember.js b/DirectReport/browserview/static/js/teamreport/teammember.js
index 83929653..95d74388 100644
--- a/DirectReport/browserview/static/js/teamreport/teammember.js
+++ b/DirectReport/browserview/static/js/teamreport/teammember.js
@@ -1,5 +1,6 @@
 
 const { useState, useEffect } = React;
+
 const TeamMember = () => {
 
     const [userData, setUserData] = useState({});
diff --git a/DirectReport/browserview/static/js/teamreport/teamreport.js b/DirectReport/browserview/static/js/teamreport/teamreport.js
index d9d6b068..aa221de1 100644
--- a/DirectReport/browserview/static/js/teamreport/teamreport.js
+++ b/DirectReport/browserview/static/js/teamreport/teamreport.js
@@ -1,15 +1,73 @@
-const { useState, useEffect } = React;
+'use strict';
 
-const TeamReport = () => {
+const { useState, useCallback, useEffect } = React;
 
-    const [teamData, setTeamData] = useState({})
-    const [commentText, setCommentText] = useState("")
-    const [isOpened, setIsOpened] = useState(false)
+class TeamReport extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            teamData: {},
+            commits: []
+        }
+        this.handleTeamDataChange = this.handleTeamDataChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this)
+        this.openRepoPopover = this.openRepoPopover.bind(this);
+        this.setCommits = this.setCommits.bind(this);
+        this.toggle =  this.toggle.bind(this);
+        this.toggleHide = this.toggleHide.bind(this);
+    }
+
+    toggle() {
+        this.setState({isOpened: !this.state.isOpened});
+    }
+
+    toggleHide() {
+        this.setState({isHidden: !this.state.isHidden});
+    }
+
+    handleTeamDataChange(team) {
+        this.setState({teamData: team});
+    }
+
+    setCommits(commitsData) {
+        this.setState({commits: commitsData});
+    }
 
-    const handleSubmit = e => {
-        e.preventDefault()
+    update(repoURL) {
+        axios({
+            method: 'post',
+            url: "/repo" + repoURL,
+            headers: {'content-type': 'application/json'}
+        }).then(result => {
+
+            const results = result.data.map((commit) =>{
+                console.log(commit)
+                return {
+                    'message': commit['commit']['message'],
+                    'name': commit['commit']['author']['name'],
+                    'authur_url': commit['author']['html_url'],
+                    'author_name': commit['author']['login'],
+                    'commit_author_email': commit['commit']['author']['email'],
+                    'commit_author_name': commit['commit']['author']['name'],
+                    'commit_author_date': commit['commit']['author']['date'],
+                    'committer': commit['commit']['committer']['name'],
+                    'committer_data': commit['commit']['committer']['date'],
+                    'committer_email': commit['commit']['committer']['email'],
+                    'comment_count': commit['commit']['comment_count'],
+                    'type': 'commit'
+                }
+            })
+            console.log(results)
+            this.setCommits(results);
+        }).catch(error => {
+            console.log(error);
+        })
+    }
+
+
+    handleSubmit(event) {
         var dataForm = {
-            "prompt": commentText
+            "prompt": this.state.commentText
         };
         const formDataJsonString = JSON.stringify(dataForm);
         fetch("/report", {
@@ -22,172 +80,124 @@ const TeamReport = () => {
         }).then(function(res) {
             return res.json();
         }).then(function(data) {
-            setTeamData(data);
-            toggle();
+            this.handleTeamDataChange(data);
+            this.toggle();
             showGraphics(data, '#map-container');
             showGraphics2(data, '#map-container2');
             showGraphics3(data, '#map-container3');
         }).then(function() {
             console.log('done');
         });
-    };
-
-    const handleClick = e => {
-        e.preventDefault()
-        var dataForm = {
-            "prompt": JSON.stringify(teamData)
-        };
-        const formDataJsonString = JSON.stringify(dataForm);
-        fetch("/generate_email", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                "Accept": "application/json"
-            },
-            body: formDataJsonString
-        }).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            setGeneratedEmail(data["email"]);
-            toggleHide();
-        });
     }
 
-    const closePopover = () => {
-        document.getElementById('popover-id-left-purple').classList.toggle("hidden");
-    }
-
-    const closeRepoPopover = () => {
-        document.getElementById('popover-repo-left-purple').classList.toggle("hidden");
-    }
-
-
-    const openPopover = (e: ChangeEvent<HTMLInputElement>, teammember) => {
-        e.preventDefault();
-        let element = e.target;
-        while("BUTTON" !== element.nodeName) {
-            element = element.parentNode;
-        }
-        Popper.createPopper(element, document.getElementById('popover-id-left-purple'), {
-            strategy: 'fixed'
-        });
-        document.getElementById('popover-id-left-purple').classList.toggle("hidden");
-        document.getElementById('popoverTitleContent').innerHTML = teammember.name
-        document.getElementById('popoverContent').innerHTML = teammember.accomplishments;
-        document.getElementById('popoverCommits').innerHTML = "Commits: " + teammember.commits;
-    }
-
-     const openRepoPopover = (e: ChangeEvent<HTMLInputElement>) => {
+    openRepoPopover(repos, state) {
         const element = document.getElementById('h1content');
         Popper.createPopper(element, document.getElementById('popover-repo-left-purple'), {
-           strategy: 'fixed'
+            strategy: 'fixed'
         });
         document.getElementById('popover-repo-left-purple').classList.toggle("hidden");
-        document.getElementById('popover-repo-TitleContent').innerHTML = "Repos" + "(" + teamData["repos"].length + ")";
-        var list = '<ul>';
-        for (var i = 0; i < teamData["repos"].length; i++) {
-            list += '<li class="px-1 py-2 border-b border-solid border-blueGray-100 hover:bg-gray-400">' + '<a className="px-8 py-10" href=/repo/' + teamData["repos"][i] + '>' + teamData["repos"][i] + '' + '</li>';
-        }
-        list += '</ul>';
-        document.getElementById('popover-repo-Content').innerHTML = list;
-    }
-
-    const repoPopoverUI = () => {
-        return (
-            <div className="hidden bg-indigo-600 border-0 mx-3 block z-50 font-normal leading-normal text-sm max-w-xs text-left no-underline break-words rounded-2xl h-58" id="popover-repo-left-purple" style={{zIndex: 2}}>
-                <div>
-                    <div id="popover-repo-Title" className="bg-indigo-600 text-white opacity-75 font-semibold p-3 mb-0 border-b border-solid border-blueGray-100 uppercase rounded-t-2xl py-3">
-                        <span id="popover-repo-TitleContent"></span>
-                        <button className="float-right" onClick={closeRepoPopover}>X</button>
-                    </div>
-                    <div id="popover-repo-Content" className="text-white px-6 py-4 h-2/3 overflow-y-scroll h-28"></div>
-                    <div id="profile-repo-Button" className="text-white px-6 py-4"></div>
-                    {/*<div id="profile-repo-Button" className="text-white px-6 py-4 border-t border-solid border-blueGray-100">*/}
-                    {/*</div>*/}
-                </div>
-            </div>
-        )
-    }
-
-    function toggle() {
-        setIsOpened(isOpened => !isOpened);
-    }
-
-    function toggleHide() {
-        setIsHidden(isHidden => !isHidden);
-    }
-
-    function toggle() {
-        setIsOpened(isOpened => !isOpened);
-    }
+        document.getElementById('popover-repo-TitleContent').innerHTML = "Repos" + "(" + repos.length + ")";
+        const content = document.getElementById('popover-repo-Content');
+        var list_element = document.createElement("ul")
+        repos.map((repo) => {
+            var li = document.createElement("li");
+            var repoURL = repo["url_repo"].substring(28, repo['url'].length).replace("/", "?repo_url=")
+            li.innerHTML = '<span>' + repo["name"] + '</span>'
+            li.classList.add("py-3");
+            li.classList.add("px-3");
+            li.classList.add("border-b");
+            li.classList.add("border-solid");
+            li.classList.add("border-blueGray-100");
+            li.onclick = () => {
+                this.update(repoURL);
+                document.getElementById('popover-repo-left-purple').classList.toggle("hidden");
+            }
+            list_element.append(li)
+        })
+        content.appendChild(list_element);
+    };
 
-    const FormDiv = (handleSubmit, openRepoPopover, commentText) => {
+    render() {
         return (
-            <div className="py-1 bg-blue-500 rounded-3xl px-20 shadow-[1.0px_1.0px_2.0px_1.0px_rgba(0,0,0,0.58)]">
-                <form onSubmit={handleSubmit}>
-                    <h1 id="title_element" className="self-center text-center text-white text-xl text-center font-semibold font-mono mb-1 mt-3">Enter
-                        Github Data
-                    </h1>
-                    <div className="self-center mb-4 mt-2">
-                        <div className="py-2 px-10 mx-0 min-w-full flex flex-col items-center">
-                            <textarea id="prompt_input" cols="38" rows="13" className="self-center py-2 border-2 bg-slate-100 shadow-[1.5px_2.0px_1.0px_0.5px_rgba(0,0,0,0.28)] border-gray-200 w-90 h-78 sm:w-90 text-xs font-sm break-words tracking-wide text-blue-600 placeholder-white border rounded-3xl focus:shadow-outline" value={commentText} onChange={e => setCommentText(e.target.value)}>
-                            </textarea>
+            <div>
+                <h1 id="h1content" className="self-center text-center text-2xl text-blue-800 text-center font-bold font-mono pt-10 pb-2 mb-8 pt-8 mx-30 px-20">
+                    Generate Team Report From Metadata
+                </h1>
+                {repoPopoverUI()}
+                <div id="topRow" className="grid grid-cols-3 gap-10 rounded-3xl mx-20 mt-6">
+                    <div className="lg:col-span-1 sm:col-span-3 justify-center" id="edit_summary_div">
+                        <div className="py-1 bg-blue-500 rounded-3xl px-10 shadow-[1.0px_1.0px_2.0px_1.0px_rgba(0,0,0,0.58)]">
+                            {this.props.repos.length > 0 && (
+                                <h1 id="title_element"
+                                    className="self-center text-center text-white text-xl text-center font-semibold font-mono mb-1 mt-3">
+                                    Github Repo For Report
+                                </h1>
+                            )}
+                            {this.props.repos.length <= 0 && (
+                                <h1 id="title_element"
+                                    className="self-center text-center text-white text-xl text-center font-semibold font-mono mb-1 mt-3">
+                                    Github Account
+                                </h1>
+                            )}
+                            {this.state.commits.length > 0 && (
+                                <div className="bg-white px-3 rounded-3xl h-80 overflow-y-auto">
+                                    {this.state.commits.map((commit) => {
+                                        return (
+                                            <div className="h-30 mb-2 m-2">
+                                                <p className="text-sm">{commit.message}</p>
+                                                <p className="text-sm">{commit.name}</p>
+                                                <p className="text-sm">{commit.commit_author_date}</p>
+                                            </div>
+                                        )
+                                    })}
+                                </div>
+                            )}
+                            <div className="self-center mb-4 mt-2">
+                                <div className="mx-0 min-w-full flex flex-col items-center">
+                                    {this.props.repos.length > 0 && (
+                                        <button className="bg-slate-100 hover:bg-blue-400 text-blue-500 shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:text-white hover:border-gray-200 text-lg font-semibold py-3 px-20 rounded-2xl mt-2"
+                                                onClick={(e) => this.openRepoPopover(this.props.repos, this.state)}
+                                                type="button">Select</button>
+                                    )}
+                                    {this.props.repos.length <= 0 && (
+                                        <button className="bg-slate-100 shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:bg-blue-400 text-blue-500 hover:text-white hover:border-gray-200 text-lg font-semibold py-3 px-20 rounded-2xl mt-2" type="button">
+                                            <a href='/authorize/github'>Authorize</a>
+                                        </button>
+                                    )}
+                                </div>
+                            </div>
                         </div>
-                        <div className="px-10 mx-0 min-w-full flex flex-col items-center">
-                            <button id="submit_prompt_btn" className="w-80 sm:w-90 bg-slate-100 shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:bg-blue-400 text-blue-500 hover:text-white hover:border-gray-200 text-lg font-semibold py-2 px-5 rounded-2xl mt-2" type="submit">
-                                Generate
-                            </button>
-                            <p></p>
-                            <button className="w-80 sm:w-90 bg-slate-100 hover:bg-blue-400 text-blue-500 shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:text-white hover:border-gray-200 text-lg font-semibold py-2 px-5 rounded-2xl mt-2" onClick={(e) => openRepoPopover(e)} type="button">Repos</button>
+                    </div>
+                    <div id="show_summmary_div" className="lg:col-span-1 sm:col-span-3 justify-center">
+                        <div className="pb-6 pt-2 bg-blue-500 rounded-3xl px-30 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
+                            <h1 className="self-center text-center text-xl text-white text-center font-semibold font-mono mb-1 mt-2 mx-20 px-20">Summary</h1>
+                            <div id="summary" className="px-4 mx-0 mb-3 mt-2">
+                                {this.props.isOpened && (
+                                    <div id="summary-container" className="ml-3 mr-3 bg-slate-100 shadow-[1.0px_1.0px_6.0px_0.0px_rgba(0,0,0,0.58)] overflow-y-scroll h-100 rounded-3xl tracking-wide text-gray-500 md:text-gl dark:text-gray-400 mt-3 px-3 pt-6">
+                                        {ShowSummary(this.props.teamData["report"])}
+                                        {ShowHighlights(this.props.teamData["report"])}
+                                    </div>
+                                )}
+                            </div>
                         </div>
                     </div>
-                </form>
-            </div>
-        )
-    }
-
-    return (
-        <div>
-            <h1 id="h1content" className="self-center text-center text-2xl text-blue-800 text-center font-bold font-mono pt-10 pb-2 mb-2 pt-8 mx-30 px-20">
-                Generate Team Report From Metadata
-            </h1>
-            {repoPopoverUI()}
-            <div id="topRow" className="grid grid-cols-3 gap-10 rounded-3xl mx-20 mt-6">
-                <div className="lg:col-span-1 sm:col-span-3 justify-center" id="edit_summary_div">
-                    {FormDiv(handleSubmit, openRepoPopover, commentText)}
-                </div>
-                <div id="show_summmary_div" className="lg:col-span-1 sm:col-span-3 justify-center">
-                    <div className="pb-6 pt-2 bg-blue-500 rounded-3xl px-30 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
-                        <h1 className="self-center text-center text-xl text-white text-center font-semibold font-mono mb-1 mt-2 mx-20 px-20">Summary</h1>
-                        <div id="summary" className="px-4 mx-0 mb-3 mt-2">
-                            {isOpened && (
-                                <div id="summary-container" className="ml-3 mr-3 bg-slate-100 shadow-[1.0px_1.0px_6.0px_0.0px_rgba(0,0,0,0.58)] overflow-y-scroll h-100 rounded-3xl tracking-wide text-gray-500 md:text-gl dark:text-gray-400 mt-3 px-3 pt-6 pb-20">
-                                    {ShowSummary(teamData["report"])}
-                                    {ShowHighlights(teamData["report"])}
+                    <div id="team_member_to_select" className="lg:col-span-1 sm:col-span-3 justify-center">
+                        <div className="pb-6 pt-2 bg-blue-500 rounded-3xl px-4 mb-2 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
+                            <h1 className="self-center text-center text-xl text-white text-center font-semibold font-mono mb-1 mt-2 mx-20 px-20">Team</h1>
+                            {PopoverUI(closePopover)}
+                            <div id="display_team" className="my-3"></div>
+                            {this.props.isOpened && (
+                                <div className="content-center py-1 h-90 rounded-3xl mb-4 bg-slate-100 shadow-[1.0px_1.0px_6.0px_0.0px_rgba(0,0,0,0.58)] mx-1 px-3">
+                                    {ShowTeamList(this.props.teamData["team"], openPopover)}
                                 </div>
                             )}
                         </div>
                     </div>
                 </div>
-                <div id="team_member_to_select" className="lg:col-span-1 sm:col-span-3 justify-center">
-                    <div className="pb-6 pt-2 bg-blue-500 rounded-3xl px-4 mb-2 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
-                        <h1 className="self-center text-center text-xl text-white text-center font-semibold font-mono mb-1 mt-2 mx-20 px-20">Team</h1>
-                        {PopoverUI(closePopover)}
-                        <div id="display_team" className="my-3"></div>
-                        {isOpened && (
-                            <div className="content-center py-1 h-90 rounded-3xl mb-4 bg-slate-100 shadow-[1.0px_1.0px_6.0px_0.0px_rgba(0,0,0,0.58)] mx-1 px-3">
-                                {ShowTeamList(teamData["team"], openPopover)}
-                            </div>
-                        )}
-                    </div>
-                </div>
+                {this.props.isOpened && (
+                    <GraphicsUI/>
+                )}
             </div>
-            {isOpened && (
-                <GraphicsUI/>
-            )}
-        </div>
-    );
+        )
+    }
 };
-
-const domContainer = document.querySelector('#root');
-ReactDOM.render(<TeamReport/>, domContainer);
diff --git a/DirectReport/browserview/static/js/teamreport/teamreportcomponents.js b/DirectReport/browserview/static/js/teamreport/teamreportcomponents.js
index 9a0dd85f..68efe201 100644
--- a/DirectReport/browserview/static/js/teamreport/teamreportcomponents.js
+++ b/DirectReport/browserview/static/js/teamreport/teamreportcomponents.js
@@ -1,6 +1,5 @@
 const { useState, useEffect } = React;
 
-
 const ShowSummary = (report) => {
     return (
         <p id="show_summary" className="w-97 sm:w-97 overflow-y-auto break-words">
@@ -15,7 +14,7 @@ const ShowSummary = (report) => {
 
 const ShowHighlights = (report) => {
     return (
-        <div className="h-40">
+        <div className="h-30">
             <ul className="px-2 pt-2 pb-2">
                 {report["highlights"] && report["highlights"].map(hightlight =>
                     <li className="mt-1 mb-3">
@@ -44,6 +43,44 @@ const ShowTeamList = (team, openPopover) => {
     )
 }
 
+const openPopover = (e: ChangeEvent<HTMLInputElement>, teammember) => {
+    e.preventDefault();
+    let element = e.target;
+    while("BUTTON" !== element.nodeName) {
+        element = element.parentNode;
+    }
+    Popper.createPopper(element, document.getElementById('popover-id-left-purple'), {
+        strategy: 'fixed'
+    });
+    document.getElementById('popover-id-left-purple').classList.toggle("hidden");
+    document.getElementById('popoverTitleContent').innerHTML = teammember.name
+    document.getElementById('popoverContent').innerHTML = teammember.accomplishments;
+    document.getElementById('popoverCommits').innerHTML = "Commits: " + teammember.commits;
+}
+
+const repoPopoverUI = () => {
+    return (
+        <div className="hidden bg-indigo-600 border-0 mx-3 block z-50 font-normal leading-normal text-sm max-w-xs text-left no-underline break-words rounded-2xl h-58" id="popover-repo-left-purple" style={{zIndex: 2}}>
+            <div>
+                <div id="popover-repo-Title" className="bg-indigo-600 text-white opacity-75 font-semibold p-3 mb-0 border-b border-solid border-blueGray-100 uppercase rounded-t-2xl py-4">
+                    <span id="popover-repo-TitleContent"></span>
+                    <button className="float-right" onClick={closeRepoPopover}>X</button>
+                </div>
+                <div id="popover-repo-Content" className="text-white px-6 py-2 h-2/3 overflow-y-scroll h-36"></div>
+                <div id="profile-repo-Button" className="text-white px-6 py-4"></div>
+            </div>
+        </div>
+    )
+}
+
+const closeRepoPopover = () => {
+    document.getElementById('popover-repo-left-purple').classList.toggle("hidden");
+}
+
+const closePopover = () => {
+    document.getElementById('popover-id-left-purple').classList.toggle("hidden");
+}
+
 class GraphDiv extends React.Component {
     render() {
         return (
@@ -77,8 +114,6 @@ const GraphicsUI = () => {
     )
 }
 
-
-
 const PopoverUI = (closePopover) => {
     return (
         <div className="hidden bg-indigo-600 border-0 mr-3 block z-50 font-normal leading-normal text-sm max-w-xs text-left no-underline break-words rounded-lg" id="popover-id-left-purple">
diff --git a/DirectReport/browserview/templates/base.html b/DirectReport/browserview/templates/base.html
index bb47c228..cd7699cb 100644
--- a/DirectReport/browserview/templates/base.html
+++ b/DirectReport/browserview/templates/base.html
@@ -14,16 +14,17 @@
     <script crossorigin src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
     <script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
     <script crossorigin src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
     {% block style %}{% endblock %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static',filename='css/main.css') }}">
 </head>
 <header class="sticky top-0 z-50">
-    {% include "_navigation.html" %}
+    {% include "components/_navigation.html" %}
 </header>
 <body>
 {% block content %}
 {% endblock %}
 </body>
-{% include "_footer.html" %}
+{% include "components/_footer.html" %}
 </html>
diff --git a/DirectReport/browserview/templates/_footer.html b/DirectReport/browserview/templates/components/_footer.html
similarity index 100%
rename from DirectReport/browserview/templates/_footer.html
rename to DirectReport/browserview/templates/components/_footer.html
diff --git a/DirectReport/browserview/templates/_navigation.html b/DirectReport/browserview/templates/components/_navigation.html
similarity index 94%
rename from DirectReport/browserview/templates/_navigation.html
rename to DirectReport/browserview/templates/components/_navigation.html
index 84268057..30121151 100644
--- a/DirectReport/browserview/templates/_navigation.html
+++ b/DirectReport/browserview/templates/components/_navigation.html
@@ -16,10 +16,10 @@
                          <a class="bg-gray-900 hover:bg-gray-400 py-5 pl-8 pr-8 block whitespace-no-wrap text-white border-b-2 border-t-2 border-gray-200" href="/account">Dashboard</a>
                      </li>
                     <li class="">
-                        <a class="bg-gray-900 hover:bg-gray-400 py-5 pl-8 pr-8 block whitespace-no-wrap text-white border-b-2 border-gray-200" href="/teamreport">New Report</a>
+                        <a class="bg-gray-900 hover:bg-gray-400 py-5 pl-8 pr-8 block whitespace-no-wrap text-white border-b-2 border-gray-200" href="/reports/new">New Report</a>
                     </li>
                     <li class="">
-                        <a class="bg-gray-900 hover:bg-gray-400 py-5 pl-8 pr-8 block whitespace-no-wrap text-white border-b-2 border-gray-200" href="/list">Saved Reports</a>
+                        <a class="bg-gray-900 hover:bg-gray-400 py-5 pl-8 pr-8 block whitespace-no-wrap text-white border-b-2 border-gray-200" href="/reports">Saved Reports</a>
                     </li>
                      <li class="">
                          <a class="bg-gray-900 hover:bg-gray-400 pt-5 pb-5 pl-8 pr-8 block whitespace-no-wrap text-white" href="/logout">Log Out</a>
diff --git a/DirectReport/browserview/templates/team/teamreport.html b/DirectReport/browserview/templates/team/teamreport.html
index a146c380..001dc32f 100644
--- a/DirectReport/browserview/templates/team/teamreport.html
+++ b/DirectReport/browserview/templates/team/teamreport.html
@@ -6,14 +6,18 @@
 
 {% block content %}
     <main className="">
-        <div id="root" class='bg-slate-200 mx-50 pb-[120px]'></div>
-        <script>
-            {#const chart_data = {{ teamData|tojson }}#}
-            {#console.log(chart_data);#}
+        <div id="root" class='bg-slate-200 mx-50 pb-[400px]'></div>
+
+        <script type="text/babel">
+            var data = {{data|tojson|safe}}
         </script>
         <script type="text/babel" src="{{url_for('static', filename='js/teamreport/teamreportcomponents.js')}}"></script>
         <script type="text/babel" src="{{url_for('static', filename='js/chart_helper.js')}}"></script>
         <script type="text/babel" src="{{url_for('static', filename='js/teamreport/teamreport.js')}}"></script>
-
+        <script type="text/babel">
+            console.log(data);
+            const domContainer = document.querySelector('#root');
+            ReactDOM.render(<TeamReport repos={data} commit={[]}/>, domContainer);
+        </script>
     </main>
 {% endblock %}
\ No newline at end of file
diff --git a/DirectReport/datadependencies/appsecrets.py b/DirectReport/datadependencies/appsecrets.py
index 86627a65..e69de29b 100644
--- a/DirectReport/datadependencies/appsecrets.py
+++ b/DirectReport/datadependencies/appsecrets.py
@@ -1,8 +0,0 @@
-global SECRET_KEY
-SECRET_KEY = ""
-global GITHUB_TOKEN
-GITHUB_TOKEN = ""
-global GOOGLE_AI_TOKEN
-GOOGLE_AI_TOKEN = ""
-global MISTRAL_API_KEY
-MISTRAL_API_KEY = ""
diff --git a/DirectReport/datadependencies/prompts.py b/DirectReport/datadependencies/prompts.py
index e5a0d9b4..f30a196e 100644
--- a/DirectReport/datadependencies/prompts.py
+++ b/DirectReport/datadependencies/prompts.py
@@ -1 +1,5 @@
 #!/usr/bin/env python3
+
+global GENERATE_EMAIL_PROMPT_PREFIX
+global GENERATE_SUMMARY_PROMPT_PREIX
+
diff --git a/DirectReport/models/Report/__init__.py b/DirectReport/models/Report/__init__.py
index e69de29b..478ec4ac 100644
--- a/DirectReport/models/Report/__init__.py
+++ b/DirectReport/models/Report/__init__.py
@@ -0,0 +1,3 @@
+from .report_model import ReportModel
+from .report import Report
+from .report_builder import ReportBuilder
diff --git a/DirectReport/models/Report/report_builder.py b/DirectReport/models/Report/report_builder.py
index b8989b20..27b80ec4 100644
--- a/DirectReport/models/Report/report_builder.py
+++ b/DirectReport/models/Report/report_builder.py
@@ -2,8 +2,8 @@
 
 import datetime
 import uuid
-from DirectReport.models.Report.report import Report
-from DirectReport.models.Report.report_model import ReportModel
+from DirectReport.models.report.report import Report
+from DirectReport.models.report.report_model import ReportModel
 
 
 class ReportBuilder:
@@ -23,7 +23,7 @@ def new(report, raw_input, user_id, repo_name):
         :param topic_text: The topic for the entry (optional).
         """
         today = datetime.date.today().strftime("%m/%d/%Y")
-        storage = ReportModel('ReportStorage.db')
+        storage = ReportModel('reports.db')
         storage.create_table()
         if report is None or report == '':
             report = "Entry for work on " + str(today)
@@ -38,7 +38,7 @@ def delete(entry_id):
         Deletes an entry with the specified ID.
         :param entry_id: The ID of the entry to delete.
         """
-        storage = ReportModel('ReportStorage.db')
+        storage = ReportModel('reports.db')
         storage.delete_entry(entry_id)
 
     @staticmethod
@@ -57,7 +57,7 @@ def list_today():
         Lists all entries for today.
         :return: A list of entries for today.
         """
-        storage = ReportModel('ReportStorage.db')
+        storage = ReportModel('reports.db')
         list = storage.list_all_reports()
         return list
 
@@ -67,6 +67,6 @@ def list_all():
         Lists all entries.
         :return: A list of all entries.
         """
-        storage = ReportModel('ReportStorage.db')
+        storage = ReportModel('reports.db')
         list_items = storage.list_all_reports_as_dict()
         return list_items
diff --git a/DirectReport/models/Report/report_model.py b/DirectReport/models/Report/report_model.py
index 369eb2cf..9c158b9e 100644
--- a/DirectReport/models/Report/report_model.py
+++ b/DirectReport/models/Report/report_model.py
@@ -1,25 +1,11 @@
 #!/usr/bin/env python3
 
 import sqlite3
-from DirectReport.models.Report.report import Report
+from DirectReport.models.report.report import Report
+from DirectReport.models.entry.entry_storage import Storage
 
 
-class ReportModel:
-    """
-    A class to interact with SQLite database for storing and retrieving `Entry` objects.
-    """
-
-    def __init__(self, db_path, conn=None):
-        """
-        Initializes the EntryStorage object with the given SQLite database file path.
-        :param db_path: The SQLite database file path.
-        """
-        if conn is None:
-            self.conn = sqlite3.connect(db_path)
-        else:
-            self.conn = conn
-        self.create_table()
-
+class ReportModel(Storage):
     def create_table(self):
         """
         Creates the `entries` table in the SQLite database if it doesn't exist.
@@ -141,7 +127,7 @@ def get_reports_userid(self, user_id):
         :return: The `Entry` object if found, otherwise `None`.
         """
         cursor = self.conn.cursor()
-        result = cursor.execute(
+        cursor.execute(
             "SELECT uuid, user_id, raw_input, report, repo_name, created_at FROM reports WHERE user_id = ?",
             (str(user_id),),
         )
diff --git a/DirectReport/models/entry/entry_storage.py b/DirectReport/models/entry/entry_storage.py
index 5c4fe565..30a0a9b1 100644
--- a/DirectReport/models/entry/entry_storage.py
+++ b/DirectReport/models/entry/entry_storage.py
@@ -4,11 +4,7 @@
 from DirectReport.models.entry.entry import Entry
 
 
-class EntryStorage:
-    """
-    A class to interact with SQLite database for storing and retrieving `Entry` objects.
-    """
-
+class Storage:
     def __init__(self, db_path, conn=None):
         """
         Initializes the EntryStorage object with the given SQLite database file path.
@@ -20,6 +16,8 @@ def __init__(self, db_path, conn=None):
             self.conn = conn
         self.create_table()
 
+
+class EntryStorage(Storage):
     def create_table(self):
         """
         Creates the `entries` table in the SQLite database if it doesn't exist.
diff --git a/DirectReport/models/Report/team_member.py b/DirectReport/models/team/team_member.py
similarity index 100%
rename from DirectReport/models/Report/team_member.py
rename to DirectReport/models/team/team_member.py
diff --git a/DirectReport/models/Report/team_member_model.py b/DirectReport/models/team/team_member_model.py
similarity index 100%
rename from DirectReport/models/Report/team_member_model.py
rename to DirectReport/models/team/team_member_model.py