diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..62e430aca
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'
\ No newline at end of file
diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..22dab8663 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -31,4 +31,12 @@ def create_app(test_config=None):
 
     # Register Blueprints here
 
+    #Task Blueprint
+    from.routes import task_bp
+    app.register_blueprint(task_bp)
+
+    #Goal Blueprint
+    from.routes import goal_bp
+    app.register_blueprint(goal_bp)
+
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..3040d60f8 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,6 +1,15 @@
 from flask import current_app
 from app import db
+from sqlalchemy.orm import backref
 
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", backref="goal", lazy=True)
+
+    def to_dict(self):
+        return {
+            "id": self.goal_id,
+            "title": self.title
+            }
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..ce6ef24ec 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,34 @@
 from flask import current_app
 from app import db
+from app.models.goal import Goal
 
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goal_id =db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+
+    def to_dict(self):
+        if self.goal_id == None:
+            if not self.completed_at:
+                self.completed_at = None
+            else:
+                self.completed_at = True
+            return {
+                "id": self.task_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": True if self.completed_at else False
+                }
+        else:
+            task_dict = {
+                "id": self.task_id,
+                "goal_id": self.goal_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": self.completed_at is not None
+            }
+        return task_dict           
+
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..697cfcdf8 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,184 @@
-from flask import Blueprint
+from flask import Blueprint, jsonify, make_response, request
+from app.models.task import Task 
+from app.models.goal import Goal
+from app import db
+from datetime import date
+import requests
+import os
+from dotenv import load_dotenv
 
+load_dotenv()
+
+task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks")
+goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals")
+
+@task_bp.route("", methods=["GET", "POST"])
+def handle_all_tasks():
+    tasks_response = []
+    
+    #WV2: Get Tasks Asc, Get Tasks Desc
+    if request.method == "GET":
+        if request.args.get('sort') == 'asc':
+            tasks = Task.query.order_by(Task.title.asc()).all()
+        elif request.args.get('sort') == 'desc':
+            tasks = Task.query.order_by(Task.title.desc()).all()
+
+        #WV1: No Saved Tasks, One Saved Tasks
+        else:
+            tasks = Task.query.all()     
+        for task in tasks:
+            tasks_response.append(task.to_dict())
+        return jsonify(tasks_response), 200 
+
+    #WV1: Create Task With None Completed_At, Create Task - Title, Create Task - Description, Create Task - Completed_At
+    #WV3: Create Task Wtih Valid Completed_At
+    if request.method == "POST":
+        request_body = request.get_json()
+        try:
+            new_task = Task(title = request_body["title"], 
+                            description = request_body["description"],
+                            completed_at = request_body["completed_at"])
+        except KeyError:
+            return ({'details': 'Invalid data'}, 400)        
+        db.session.add(new_task)
+        db.session.commit()
+        return jsonify({"task":new_task.to_dict()}), 201
+
+@task_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE"])
+def handle_single_task(task_id):
+    task_id = int(task_id)
+    task = Task.query.get(task_id)
+
+    #WV1: Get Task, Get Task Not Found
+    if request.method == "GET":
+        if task is None:
+            return make_response("", 404)
+        return jsonify({"task": task.to_dict()}), 200 
+
+    #WV1: Update Task, Update Task Not Found
+    #WV3: Update Task With Valid Completed At
+    elif request.method == "PUT":
+        input_data = request.get_json()
+        if task is None:
+            return make_response("", 404)
+        task.title = input_data["title"]
+        task.description = input_data["description"]
+        db.session.commit()
+        return ({"task":task.to_dict()}), 200
+
+    #WV1: Delete Task, Delete Task Not Found
+    elif request.method == "DELETE":
+        if task is None:
+            return make_response("", 404)
+        else:
+            db.session.delete(task)
+            db.session.commit()
+            return ({'details': f'Task {task_id} "{task.title}" successfully deleted'}), 200
+
+#WV3: Mark Comp on Incom, Mark Incom on Comp, Mark Comp on Comp, Marck Comp on Missing, Mark Incom on Missing 
+@task_bp.route("/<task_id>/<completion_status>", methods=["PATCH"])
+def mark_complete(task_id, completion_status):
+
+    task = Task.query.get(task_id)
+    PATH="https://slack.com/api/chat.postMessage"
+    if task is None:
+        return make_response("", 404)
+    
+    if completion_status == "mark_complete":
+        task.completed_at = date.today()
+
+        #WV4: Send Slack Message
+        token=os.environ.get("TOKEN")   
+        query_params = {
+            "token": token,
+            "channel": "task-notifications",
+            "text": f"Somone just completed task {task.title}"
+        }
+        requests.post(PATH, data=query_params)
+
+    if completion_status == "mark_incomplete":
+        task.completed_at = None
+    db.session.commit()
+    
+    return jsonify({"task": task.to_dict()})
+
+@goal_bp.route("", methods=["GET", "POST"])
+def handle_all_goals():
+    goal_response = []
+
+    #WV5: No Saved Goals, One Saved Goals
+    if request.method == "GET":
+        goals = Goal.query.all() 
+        for goal in goals:
+            goal_response.append(goal.to_dict())
+        return jsonify(goal_response), 200 
+
+    #WV5: Create Goal, Create Goal Missing Title
+    if request.method == "POST":
+        request_body = request.get_json()
+        try:
+            new_goal = Goal(title = request_body["title"])
+        except KeyError:
+            return ({'details': 'Invalid data'}, 400)       
+        db.session.add(new_goal)
+        db.session.commit()
+
+        return jsonify({"goal": new_goal.to_dict()}), 201 
+
+@goal_bp.route("/<goal_id>", methods=["GET", "DELETE", "PUT", "PATCH"])
+def handle_single_goal(goal_id):
+    goal_id = int(goal_id)
+    goal = Goal.query.get(goal_id)
+
+    #WV5: Get Goal, Get Goal Not Found
+    if request.method == "GET":
+        if goal is None:
+            return make_response("", 404)
+        return jsonify({"goal": goal.to_dict()}), 200 
+
+    #WV5: Update Goal, Update Goal Not Found
+    elif request.method == "PUT":
+        input_data = request.get_json()
+        if goal is None:
+            return make_response("", 404)
+        goal.title = input_data["title"]
+        db.session.commit()
+        return ({"goal": goal.to_dict()}), 200
+
+    #WV5: Delete Goal Not Found, Delete Goal
+    elif request.method == "DELETE":
+        if goal is None:
+            return make_response("", 404)
+        else:
+            db.session.delete(goal)
+            db.session.commit()
+            return ({'details': f'Goal {goal_id} "{goal.title}" successfully deleted'}), 200
+
+@goal_bp.route("/<goal_id>/tasks", methods=["GET", "POST"])
+def handle_goal_and_tasks(goal_id):
+    goal = Goal.query.get(goal_id)
+    request_body = request.get_json()
+    
+    #W5: Get Tasks, Get Tasks No Goal, Get Tasks No Tasks, Task Include Goal ID
+    if request.method == "GET":
+        if goal is None:
+            return make_response("", 404)       
+        task_list = []
+        for task in goal.tasks:
+            task_list.append(task.to_dict())
+        return {
+            "id": goal.goal_id,
+            "title": goal.title,
+            "tasks": task_list
+        }, 200
+    
+    #W5: Post Tasks IDs to Goal, Post Tasks to Goal with Goals
+    if request.method == "POST":
+        if goal is None:
+            return make_response("", 404)
+    task_ids = request_body["task_ids"]
+    for id in task_ids:
+        task = Task.query.get(id)
+        task.goal_id = goal_id
+        db.session.commit()
+    return make_response({"id": int(goal_id), "task_ids": task_ids}), 200
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..98e4f9c44
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..f8ed4801f
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 000000000..8b3fb3353
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,96 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 000000000..2c0156303
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/migrations/versions/51ba624ce24d_.py b/migrations/versions/51ba624ce24d_.py
new file mode 100644
index 000000000..c99d27d0f
--- /dev/null
+++ b/migrations/versions/51ba624ce24d_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 51ba624ce24d
+Revises: 55bc12d7c22f
+Create Date: 2021-11-03 15:12:40.175537
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '51ba624ce24d'
+down_revision = '55bc12d7c22f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('title', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/55bc12d7c22f_.py b/migrations/versions/55bc12d7c22f_.py
new file mode 100644
index 000000000..b6a32b402
--- /dev/null
+++ b/migrations/versions/55bc12d7c22f_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 55bc12d7c22f
+Revises: 
+Create Date: 2021-11-02 11:27:18.656018
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '55bc12d7c22f'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('goal_id', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('task',
+    sa.Column('task_id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.String(), nullable=True),
+    sa.Column('description', sa.String(), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ea681a853a27_.py b/migrations/versions/ea681a853a27_.py
new file mode 100644
index 000000000..7ba72e13c
--- /dev/null
+++ b/migrations/versions/ea681a853a27_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: ea681a853a27
+Revises: 51ba624ce24d
+Create Date: 2021-11-04 12:37:55.079052
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ea681a853a27'
+down_revision = '51ba624ce24d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'task', type_='foreignkey')
+    op.drop_column('task', 'goal_id')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 6ba60c6fa..ab04e7aab 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,4 +1,5 @@
 import pytest
+from app.models.goal import Goal
 
 def test_get_goals_no_saved_goals(client):
     # Act
@@ -41,18 +42,16 @@ def test_get_goal(client, one_goal):
         }
     }
 
-@pytest.mark.skip(reason="test to be completed by student")
+
 def test_get_goal_not_found(client):
-    pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
     # Assert
-    # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+    assert response.status_code == 404
+    assert response_body == None
+    
 
 def test_create_goal(client):
     # Act
@@ -71,30 +70,34 @@ def test_create_goal(client):
         }
     }
 
-@pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    pass
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated Goal Title",
+    })
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body == {
+        "goal": {
+            "id": 1,
+            "title": "Updated Goal Title"
+        }
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "Updated Goal Title"
 
-@pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    pass
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+    "title": "Updated Goal Title"})
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 404
+    assert response_body == None
 
 
 def test_delete_goal(client, one_goal):
@@ -113,19 +116,16 @@ def test_delete_goal(client, one_goal):
     response = client.get("/goals/1")
     assert response.status_code == 404
 
-@pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    pass
 
     # Act
-    # ---- Complete Act Here ----
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
-
+    assert response.status_code == 404
+    assert response_body == None
+    assert Goal.query.all() == []
 
 def test_create_goal_missing_title(client):
     # Act