diff --git a/README.md b/README.md
index 9117e4f77847a06bfa888f45fd5ede2ad8849ff2..14d96268e10cf8794116d722cf3fcc9ffb35028d 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,3 @@
 # Simple Crud App
 
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://version.cs.vt.edu/docker-workers/simple-crud-app.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://version.cs.vt.edu/docker-workers/simple-crud-app/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+Insert Documentation Here
diff --git a/docker-compose.yml b/docker-compose.yml
index ed21c4a5644b80ce46fa6e936a4cbbcfda1cd36f..ca6e38f0b240cc877df107ad19e60d9214c4b40a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 
 services:
-  client:
-    image: docker.cs.vt.edu/docker-workers/simple-crud-app/angular
-    depends_on:
-      - server
-    ports:
-      - "80:80"
+  # client:
+  #   build: ./client
+  #   depends_on:
+  #     - server
+  #   ports:
+  #     - "80:80"
 
   server:
-    image: docker.cs.vt.edu/docker-workers/simple-crud-app/flask
+    build: ./server
     depends_on:
       - database
     ports:
diff --git a/manifest.yml b/manifest.yml
index 3eb4789d52e2134d9bc4b90338cc0fd6db829237..f097a7e5c6fed38aa98b21b587550064197211fa 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -16,7 +16,7 @@ spec:
         fam-app: fam-angular-client
     spec:
       containers:
-        - image: docker.cs.vt.edu/docker-workers/simple-crud-app/angular
+        - image: docker.cs.vt.edu/docker-workers/flask-angular-mariadb/angular
           imagePullPolicy: Always
           name: fam-angular-client
           ports:
@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
         - name: fam-flask-server
-          image: docker.cs.vt.edu/docker-workers/simple-crud-app/flask
+          image: docker.cs.vt.edu/docker-workers/flask-angular-mariadb/flask
           imagePullPolicy: Always
           ports:
             - containerPort: 5000
@@ -67,6 +67,8 @@ spec:
               value: root
             - name: mariadb_name
               value: demo
+            - name: FLASK_ENV
+              value: production
 ---
 apiVersion: v1
 kind: Service
diff --git a/server/Dockerfile b/server/Dockerfile
index dd5c0aa7bbd120dbe0d87b73ed51480415088b02..0f6fdf0ebdfc9ee32d34fc1ce09317a7eeee3b28 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -16,5 +16,5 @@ COPY requirements.txt /app
 RUN pip install -r requirements.txt
 
 # Run app.py when the container launches
-COPY ./src/app.py /app
+COPY ./src /app
 CMD python app.py
diff --git a/server/src/__init__.py b/server/src/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e6db29496cbc62e616570caa6c28c1a415e05aba 100644
--- a/server/src/__init__.py
+++ b/server/src/__init__.py
@@ -0,0 +1 @@
+from .app import flask_app
diff --git a/server/src/app.py b/server/src/app.py
index 0cbee72d7d4cb2e6b7065205b05d446a762a945c..754f38c9f7d9151931e8c84867c8738c8a254196 100644
--- a/server/src/app.py
+++ b/server/src/app.py
@@ -1,116 +1,48 @@
-from email.policy import HTTP
-from flask import Flask, request
-from flask_cors import CORS, cross_origin
-import json
-import os
-
-import sqlalchemy
-from sqlalchemy.ext.declarative import declarative_base
+"""
+Entrypoint of the Flask App
+"""
 
-MARIADB_DATABASE_USER = "root"
-MARIADB_DATABASE_PASSWORD = os.getenv("mariadb_password")
-MARIADB_DATABASE_DB_NAME = os.getenv("mariadb_name")
-MARIADB_DATABASE_HOST = os.getenv("FAM_MARIADB_DATABASE_SERVICE_HOST")
-MARIADB_DATABASE_PORT = os.getenv("FAM_MARIADB_DATABASE_SERVICE_PORT")
-
-engine = sqlalchemy.create_engine(
-    f"mariadb+mariadbconnector://{MARIADB_DATABASE_USER}:{MARIADB_DATABASE_PASSWORD}@{MARIADB_DATABASE_HOST}:{MARIADB_DATABASE_PORT}/{MARIADB_DATABASE_DB_NAME}"
+import os
+from controllers.pets_controller import (
+    get_all_pets_controller,
+    create_pet_controller,
+    delete_pet_controller,
+    update_vaccination_controller,
 )
+from flask import Flask, request
+from flask_cors import CORS, cross_origin
 
-Base = declarative_base()
-
-
-class Pet(Base):
-    __tablename__ = "pet"
-    id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)
-    name = sqlalchemy.Column(sqlalchemy.String(length=100))
-    breed = sqlalchemy.Column(sqlalchemy.String(length=100))
-    vaccinated = sqlalchemy.Column(sqlalchemy.Boolean, default=True)
-
-
-Base.metadata.create_all(engine)
-
-# Create a session
-Session = sqlalchemy.orm.sessionmaker()
-Session.configure(bind=engine)
-session = Session()
-
-
-def addPet(name, breed, vaccinated):
-    newPet = Pet(name=name, breed=breed, vaccinated=vaccinated)
-    session.add(newPet)
-    session.commit()
-
-
-def selectAll():
-    pets = session.query(Pet).all()
-    return pets
-
-
-def updatePetVaccination(id, isVaccinated):
-    pet = session.query(Pet).get(id)
-    pet.vaccinated = isVaccinated
-    session.commit()
-
-
-def deletePet(id):
-    session.query(Pet).filter(Pet.id == id).delete()
-    session.commit()
-
-
-# create the flask app
-app = Flask(__name__)
-cors = CORS(app)
-app.config["DEBUG"] = True
-app.config["CORS_HEADERS"] = "Content-Type"
-
-config = {
-    "user": "root",
-    "password": "root",
-    "host": "database",
-    "port": 3306,
-    "database": "demo",
-}
+# Creating the Flask App
+flask_app = Flask(__name__)
+cors = CORS(flask_app)
+flask_app.config["CORS_HEADERS"] = "Content-Type"
+flask_app.config["DEBUG"] = True
 
 
-@app.route("/api/pets", methods=["GET"])
+@flask_app.route("/api/pets", methods=["GET"])
 @cross_origin()
 def get_all_pets():
-    pets = selectAll()
-    json_data = []
-    for pet in pets:
-        json_data.append(
-            {"name": pet.name, "breed": pet.breed, "vaccinated": pet.vaccinated}
-        )
-
-    # return the results!
-    return json.dumps(json_data)
+    return get_all_pets_controller()
 
 
-@app.route("/api/pets/create", methods=["POST"])
+@flask_app.route("/api/pets/create", methods=["POST"])
 @cross_origin()
 def create_pet():
-    pet_input = request.json
-    addPet(pet_input["name"], pet_input["breed"], pet_input["vaccinated"])
-    return "Success"
+    return create_pet_controller(request.json)
 
 
-@app.route("/api/pets", methods=["DELETE"])
+@flask_app.route("/api/pets", methods=["DELETE"])
 @cross_origin()
 def delete_pet():
-    pet_input = request.json
-    delete_pet(pet_input["id"])
-    return "Successfully deleted pet!"
+    return delete_pet_controller(request.json)
 
 
-@app.route("/api/pets/updateVaccination", methods=["PUT"])
+@flask_app.route("/api/pets/updateVaccination", methods=["PUT"])
 @cross_origin()
 def update_vaccination():
-    pet_input = request.json
-    updatePetVaccination(pet_input["id"], pet_input["vaccinated"])
-    return "Updated vaccination status!"
+    return update_vaccination_controller(request.json)
 
 
-# run the app
+# Run the app
 port = int(os.environ.get("PORT", 5000))
-app.run(host="0.0.0.0", port=port)
+flask_app.run(host="0.0.0.0", port=port)
diff --git a/server/src/controllers/__init__.py b/server/src/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..6fd5195fc5042a6e8ca61b25707ef83953d80eb5
--- /dev/null
+++ b/server/src/controllers/__init__.py
@@ -0,0 +1,6 @@
+from .pets_controller import (
+    get_all_pets_controller,
+    create_pet_controller,
+    delete_pet_controller,
+    update_vaccination_controller,
+)
diff --git a/server/src/controllers/pets_controller.py b/server/src/controllers/pets_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..82be0eed123c3fc14e52a7353b02d9eb85a20b18
--- /dev/null
+++ b/server/src/controllers/pets_controller.py
@@ -0,0 +1,31 @@
+"""
+Controller module for Pets
+"""
+
+from flask import Response
+from services.pets_services import get_all, add_pet, update_pet_vaccination, delete_pet
+
+
+def get_all_pets_controller():
+    return Response(get_all(), status=200, mimetype="application/json")
+
+
+def create_pet_controller(request_body):
+    if add_pet(request_body["name"], request_body["breed"], request_body["vaccinated"]):
+        return Response(status=201)
+    else:
+        return Response(status=500)
+
+
+def delete_pet_controller(request_body):
+    if delete_pet(request_body["id"]):
+        return Response(status=204)
+    else:
+        return Response(status=500)
+
+
+def update_vaccination_controller(request_body):
+    if update_pet_vaccination(request_body["id"], request_body["vaccinated"]):
+        return Response(status=204)
+    else:
+        return Response(status=500)
diff --git a/server/src/database/__init__.py b/server/src/database/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..29123ef3ae495cbf7ab4fa4e78c96b2665ce7d3b 100644
--- a/server/src/database/__init__.py
+++ b/server/src/database/__init__.py
@@ -0,0 +1 @@
+from .database import DatabaseEngine
diff --git a/server/src/database/database.py b/server/src/database/database.py
index c995c653329201afbb0d57529f9e5ce435ec7a2d..dcdb6e52c402a37f412cce13e0027eac0a9b4bd9 100644
--- a/server/src/database/database.py
+++ b/server/src/database/database.py
@@ -1,12 +1,65 @@
+"""
+Database Engine Module
+"""
 
-import mariadb
+import os
+from sqlalchemy import create_engine
 
-config = {
-    'host': '127.0.0.1',
-    'port': 3306,
-    'user': 'root',
-    'password': 'Password123!',
-    'database': 'demo'
-}
 
+class DatabaseEngine:
+    """Holds connection configuration for connecting to MariaDB database"""
 
+    def __init__(self) -> None:
+        """Initializes class variables"""
+        # Default configuration for local development
+        self.user = "root"
+        self.password = "root"
+        self.host = "database"
+        self.port = 3306
+        self.database_name = "demo"
+
+        self.check_env_variables()
+        self.engine = self.create_database_engine()
+
+    def check_env_variables(self) -> bool:
+        """
+        If the app is running in production, it needs the environment variables to be
+        able to connect to the production mariadb service in VT Cloud.
+        """
+        if os.environ.get("FLASK_ENV") and os.environ.get("FLASK_ENV") == "production":
+            env_vars = [
+                "mariadb_password",
+                "FAM_MARIADB_DATABASE_SERVICE_HOST",
+                "FAM_MARIADB_DATABASE_SERVICE_PORT",
+                "mariadb_name",
+            ]
+
+            missing = False
+            for env in env_vars:
+                if env not in os.environ:
+                    print("ERROR: Missing environment variable: " + env)
+                    missing = True
+            else:
+                print("All needed environment variables are set!")
+
+            if missing:
+                print("Set your environment variables first!")
+                return
+
+            self.password = os.getenv("mariadb_password")
+            self.host = os.getenv("FAM_MARIADB_DATABASE_SERVICE_HOST")
+            self.port = os.getenv("FAM_MARIADB_DATABASE_SERVICE_PORT")
+            self.database_name = os.getenv("mariadb_name")
+
+    def create_database_engine(self):
+        """
+        Creates the database connection with SQLAlchemy
+        Simple connection. This does not use any database sessions.
+        """
+        database_connection_string = (
+            "mariadb+mariadbconnector://"
+            + f"{self.user}:{self.password}@"
+            + f"{self.host}:{self.port}/{self.database_name}"
+        )
+        print(database_connection_string)
+        return create_engine(database_connection_string)
diff --git a/server/src/models/__init__.py b/server/src/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..53d998588011b385e36c8a34ae9f31642776e797
--- /dev/null
+++ b/server/src/models/__init__.py
@@ -0,0 +1 @@
+from .models import Pet
diff --git a/server/src/models/models.py b/server/src/models/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..990e2abcf919cedbb96786b7bca1ecd74878ebca
--- /dev/null
+++ b/server/src/models/models.py
@@ -0,0 +1,26 @@
+"""
+Database ORM Models can be found in this module
+"""
+
+import sys
+
+import sqlalchemy
+from sqlalchemy.ext.declarative import declarative_base
+from database import DatabaseEngine
+
+Base = declarative_base()
+
+
+class Pet(Base):
+    __tablename__ = "pet"
+    id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)
+    name = sqlalchemy.Column(sqlalchemy.String(length=100))
+    breed = sqlalchemy.Column(sqlalchemy.String(length=100))
+    vaccinated = sqlalchemy.Column(sqlalchemy.Boolean, default=True)
+
+
+database_engine = DatabaseEngine()
+if database_engine.engine != None:
+    Base.metadata.create_all(database_engine.engine)
+else:
+    sys.exit("Database cannot be found!")
diff --git a/server/src/services/__init__.py b/server/src/services/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..1eedc508b808ce5a334e97b402f13d58814f88f6
--- /dev/null
+++ b/server/src/services/__init__.py
@@ -0,0 +1 @@
+from .pets_services import add_pet, get_all, update_pet_vaccination, delete_pet
diff --git a/server/src/services/pets_services.py b/server/src/services/pets_services.py
new file mode 100644
index 0000000000000000000000000000000000000000..8fbd17faa93862361c90f5b5e6cf3f0cb3693d42
--- /dev/null
+++ b/server/src/services/pets_services.py
@@ -0,0 +1,63 @@
+"""
+Services module for Pets
+"""
+
+import json
+import sqlalchemy
+from models import Pet
+from database import DatabaseEngine
+
+# Connects to database
+database_engine = DatabaseEngine()
+Session = sqlalchemy.orm.sessionmaker()
+Session.configure(bind=database_engine.engine)
+
+
+def add_pet(name, breed, vaccinated) -> bool:
+    """Adds a pet into the database"""
+    try:
+        newPet = Pet(name=name, breed=breed, vaccinated=vaccinated)
+        with Session() as session:
+            session.add(newPet)
+            session.commit()
+        return True
+    except:
+        return False
+
+
+def get_all() -> object:
+    """Gets all pets from database"""
+    try:
+        with Session() as session:
+            pets = session.query(Pet).all()
+            json_data = []
+            for pet in pets:
+                json_data.append(
+                    {"name": pet.name, "breed": pet.breed, "vaccinated": pet.vaccinated}
+                )
+            return json.dumps(json_data)
+    except:
+        return None
+
+
+def update_pet_vaccination(id, isVaccinated) -> bool:
+    """Updates the specified pet's vaccination status"""
+    try:
+        with Session() as session:
+            pet = session.query(Pet).get(id)
+            pet.vaccinated = isVaccinated
+            session.commit()
+        return True
+    except:
+        return False
+
+
+def delete_pet(id) -> bool:
+    """Deletes the specified pet from database"""
+    try:
+        with Session() as session:
+            session.query(Pet).filter(Pet.id == id).delete()
+            session.commit()
+            return True
+    except:
+        return False
diff --git a/server/tests/__init__.py b/server/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000