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/ada-project-docs/wave_01.md b/ada-project-docs/wave_01.md
index b23485a67..a598f7f4c 100644
--- a/ada-project-docs/wave_01.md
+++ b/ada-project-docs/wave_01.md
@@ -136,7 +136,7 @@ As a client, I want to be able to make a `GET` request to `/tasks/1` when there
 
 As a client, I want to be able to make a `PUT` request to `/tasks/1` when there is at least one saved task with this request body:
 
-```json
+```jso
 {
   "title": "Updated Task Title",
   "description": "Updated Test Description",
diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..d3b580808 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,5 +30,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .task_routes import bp
+    app.register_blueprint(bp)
 
+    from .goal_routes import bp
+    app.register_blueprint(bp)
+    
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
new file mode 100644
index 000000000..9a9547333
--- /dev/null
+++ b/app/goal_routes.py
@@ -0,0 +1,84 @@
+from flask import Blueprint, jsonify, make_response, request
+from app.models.task import Task
+from app.models.goal import Goal
+from .routes_helper import get_record_by_id, abort_message
+from app import db
+
+
+bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+
+@bp.route("", methods=("POST",))
+def create_goal():
+    request_body = request.get_json()
+    if "title" not in request_body:
+        abort_message("Missing title", 400)
+
+    goal = Goal.from_dict(request_body)
+    db.session.add(goal)
+    db.session.commit()
+
+    return make_response(jsonify({"goal": goal.to_dict()}), 201)
+
+
+@bp.route("/<goal_id>/tasks", methods=("POST",))
+def add_tasks_to_goal(goal_id):
+    goal = get_record_by_id(goal_id)
+    request_body = request.get_json()
+
+    tasks_list = []
+    for task_id in request_body["task_ids"]:
+        task = get_record_by_id(task_id)
+        task.goal = goal
+        tasks_list.append(task.task_id)
+
+    db.session.commit()
+    return make_response(jsonify({"id": goal.goal_id, 
+    "task_ids": tasks_list}))
+    
+
+@bp.route("/<goal_id>", methods=("GET",))
+def read_goal(goal_id):
+    goal = get_record_by_id(goal_id)
+    return make_response(jsonify({"goal": goal.to_dict()}))
+
+
+@bp.route("", methods=("GET",))
+def read_all_goals():
+    goals = Goal.query.all()
+    goals_response = [goal.to_dict() for goal in goals]
+    return make_response(jsonify(goals_response))
+
+
+@bp.route("/<goal_id>/tasks", methods=("GET",))
+def read_specific_goal_tasks(goal_id):
+    goal = get_record_by_id(goal_id)
+    
+    goal_tasks = [Task.to_dict(task) for task in goal.tasks]
+
+    return make_response(jsonify({
+        "id": goal.goal_id, 
+        "title": goal.title, 
+        "tasks": goal_tasks})
+    )
+    
+
+@bp.route("/<goal_id>", methods=("PUT",))
+def replace_goal(goal_id):
+    goal = get_record_by_id(Goal, goal_id)
+    request_body = request.get_json()
+    if "title" not in request_body:
+        abort_message("Title not found", 404)
+    goal.override_goal(request_body)
+    db.session.commit()
+
+    return jsonify({"goal": goal.to_dict()})
+
+
+@bp.route("/<goal_id>", methods=("DELETE",))
+def delete_goal(goal_id):
+    goal = get_record_by_id(goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+
+    abort_message(f'Goal {goal_id} "{goal.title}" successfully deleted')
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..47ab5d7a6 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,3 +3,23 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal")
+
+
+    @classmethod
+    def from_dict(cls, data_dict):
+        return cls(
+            title=data_dict["title"]
+        )
+
+    
+    def to_dict(self):
+        return dict(
+            id=self.goal_id,
+            title=self.title
+        )
+
+    
+    def override_goal(self, data_dict):
+        self.title = data_dict["title"]
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..b13a88899 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,3 +3,35 @@
 
 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, default=None)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+
+    def to_dict(self):
+        response_dict = dict(
+                id=self.task_id,
+                title=self.title,
+                description=self.description,
+                is_complete=self.completed_at is not None
+            )
+
+        if self.goal_id:
+            response_dict["goal_id"] = self.goal_id
+
+        return response_dict
+
+    # create similar functions for task and goal, class for creation
+    @classmethod
+    def from_dict(cls, data_dict):
+        return cls(
+                title=data_dict["title"],
+                description=data_dict["description"],
+                completed_at = data_dict.get("completed_at", None)
+            )
+        
+    def override_task(self, data_dict):
+        self.title = data_dict["title"]
+        self.description = data_dict["description"]
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
deleted file mode 100644
index 3aae38d49..000000000
--- a/app/routes.py
+++ /dev/null
@@ -1 +0,0 @@
-from flask import Blueprint
\ No newline at end of file
diff --git a/app/routes_helper.py b/app/routes_helper.py
new file mode 100644
index 000000000..87d889424
--- /dev/null
+++ b/app/routes_helper.py
@@ -0,0 +1,46 @@
+from flask import make_response, abort
+from app.models.task import Task
+from app.models.goal import Goal
+
+
+def get_task_by_id(task_id):
+    try:
+        task_id = int(task_id)
+    except:
+        abort_message("Invalid data", 400)
+
+    task = Task.query.get(task_id)
+
+    if not task:
+        abort_message("Task not found", 404)
+    return task
+
+
+def get_goal_by_id(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        abort_message("Invalid data", 400)
+
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        abort_message("Goal not found", 404)
+    return goal
+
+
+def get_record_by_id(cls, record_id):
+    try:
+        record_id = int(record_id)
+    except:
+        abort_message("Invalid data", 400)
+
+    record = cls.query.get(record_id)
+
+    if not record:
+        abort_message(f"{type(cls).__name__} not found", 404)
+    return record
+
+
+def abort_message(details_info, status_code=200):
+    abort(make_response({"details": details_info}, status_code))
\ No newline at end of file
diff --git a/app/task_routes.py b/app/task_routes.py
new file mode 100644
index 000000000..cb1e6169c
--- /dev/null
+++ b/app/task_routes.py
@@ -0,0 +1,93 @@
+from flask import Blueprint, jsonify, make_response, request
+from app.models.task import Task
+from .routes_helper import abort_message, get_record_by_id, create_message
+from app import db
+from datetime import datetime
+import requests, os
+
+
+bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+
+@bp.route("", methods=("POST",))
+def create_task():
+    request_body = request.get_json()
+    if "title" not in request_body or "description" not in request_body:
+        create_message("Title or description missing", 400)
+    task = Task.from_dict(request_body)
+    db.session.add(task)
+    db.session.commit()
+
+    return make_response(jsonify({"task": task.to_dict()}), 201)
+
+
+@bp.route("/<task_id>", methods=("GET",))
+def read_one_task(task_id):
+    task = get_record_by_id(task_id)
+    return make_response(jsonify({"task": task.to_dict()}))
+
+
+@bp.route("", methods=("GET",))
+def read_all_tasks():
+    title_query = request.args.get("sort")
+
+    if title_query == "asc":
+        tasks = Task.query.order_by(Task.title.asc())
+    elif title_query == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    else:
+        tasks = Task.query.all()
+    
+    tasks_response = [task.to_dict() for task in tasks]
+
+    return make_response(jsonify(tasks_response))
+
+
+@bp.route("/<task_id>", methods=("PUT",))
+def replace_task(task_id):
+    task = get_record_by_id(task_id)
+    request_body = request.get_json()
+    if "title" not in request_body:
+        abort_message("Title missing", 404)
+    if "description" not in request_body:
+        abort_message("Description missing", 404)
+
+    task.override_task(request_body)
+    db.session.commit()
+
+    return jsonify({"task": task.to_dict()})
+
+
+@bp.route("/<task_id>", methods=("DELETE",))
+def delete_task(task_id):
+    task = get_record_by_id(task_id)
+    db.session.delete(task)
+    db.session.commit()
+
+    create_message(f'Task {task_id} "{task.title}" successfully deleted')
+
+
+@bp.route("/<task_id>/mark_complete", methods=("PATCH",))
+def mark_task_complete(task_id):
+    task = get_record_by_id(task_id)
+    task.completed_at = datetime.utcnow()
+    db.session.commit()
+
+    requests.post(
+        url="https://slack.com/api/chat.postMessage", 
+        data={
+            "channel": "task-notifications", 
+            "text": f"Someone just completed the task {task.title}"
+        }, 
+        headers={"Authorization": os.environ.get("token")}, 
+    )
+
+    return jsonify({"task": task.to_dict()})
+
+
+@bp.route("/<task_id>/mark_incomplete", methods=("PATCH",))
+def mark_task_incomplete(task_id):
+    task = get_record_by_id(task_id)
+    task.completed_at = None
+    db.session.commit()
+    return jsonify({"task": task.to_dict()})
\ No newline at end of file
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/4e4125975412_changed_completed_at_nullable_to_false.py b/migrations/versions/4e4125975412_changed_completed_at_nullable_to_false.py
new file mode 100644
index 000000000..03f59b338
--- /dev/null
+++ b/migrations/versions/4e4125975412_changed_completed_at_nullable_to_false.py
@@ -0,0 +1,32 @@
+"""changed completed_at nullable to False
+
+Revision ID: 4e4125975412
+Revises: 7e2bad1312ad
+Create Date: 2022-05-06 16:02:55.050773
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '4e4125975412'
+down_revision = '7e2bad1312ad'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('task', 'completed_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('task', 'completed_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=True)
+    # ### end Alembic commands ###
diff --git a/migrations/versions/7e2bad1312ad_added_task_attributes.py b/migrations/versions/7e2bad1312ad_added_task_attributes.py
new file mode 100644
index 000000000..5fb5e03fe
--- /dev/null
+++ b/migrations/versions/7e2bad1312ad_added_task_attributes.py
@@ -0,0 +1,39 @@
+"""added Task attributes
+
+Revision ID: 7e2bad1312ad
+Revises: 
+Create Date: 2022-05-06 13:52:57.119607
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7e2bad1312ad'
+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/8b9c6262707c_.py b/migrations/versions/8b9c6262707c_.py
new file mode 100644
index 000000000..1a10828c5
--- /dev/null
+++ b/migrations/versions/8b9c6262707c_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 8b9c6262707c
+Revises: a2ea7a98b436
+Create Date: 2022-05-12 17:01:14.130379
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8b9c6262707c'
+down_revision = 'a2ea7a98b436'
+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/a2ea7a98b436_changed_completed_at_nullable_to_true.py b/migrations/versions/a2ea7a98b436_changed_completed_at_nullable_to_true.py
new file mode 100644
index 000000000..4a16d69cb
--- /dev/null
+++ b/migrations/versions/a2ea7a98b436_changed_completed_at_nullable_to_true.py
@@ -0,0 +1,32 @@
+"""changed completed_at nullable to True
+
+Revision ID: a2ea7a98b436
+Revises: 4e4125975412
+Create Date: 2022-05-06 16:26:23.241612
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'a2ea7a98b436'
+down_revision = '4e4125975412'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('task', 'completed_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('task', 'completed_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=False)
+    # ### end Alembic commands ###
diff --git a/migrations/versions/b555e21d83b7_.py b/migrations/versions/b555e21d83b7_.py
new file mode 100644
index 000000000..7c766680c
--- /dev/null
+++ b/migrations/versions/b555e21d83b7_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: b555e21d83b7
+Revises: 8b9c6262707c
+Create Date: 2022-05-12 22:38:56.069991
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b555e21d83b7'
+down_revision = '8b9c6262707c'
+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_01.py b/tests/test_wave_01.py
index dca626d78..2ec13a8a9 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -51,7 +51,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -60,13 +60,15 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"details": "Task not found"}
+    assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +95,7 @@ def test_create_task(client):
     assert new_task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task(client, one_task):
     # Act
     response = client.put("/tasks/1", json={
@@ -119,7 +121,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -131,13 +133,14 @@ def test_update_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"details": "Task not found"}
+    assert Task.query.get(1) is None
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +155,7 @@ def test_delete_task(client, one_task):
     assert Task.query.get(1) == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task_not_found(client):
     # Act
     response = client.delete("/tasks/1")
@@ -161,15 +164,14 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"details": "Task not found" }
+    assert Task.query.get(1) == None
 
-    assert Task.query.all() == []
-
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +188,7 @@ def test_create_task_must_contain_title(client):
     assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_description(client):
     # Act
     response = client.post("/tasks", json={
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index a087e0909..651e3aebd 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_asc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=asc")
@@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_desc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=desc")
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 959176ceb..3cee3612e 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -5,7 +5,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
     """
@@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_complete_task(client, completed_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
     """
@@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_incomplete_task(client, one_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -128,13 +128,14 @@ def test_mark_complete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"details": "Task not found"}
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -143,15 +144,16 @@ def test_mark_incomplete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"details": "Task not found"}
 
 
 # Let's add this test for creating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_with_valid_completed_at(client):
     # Act
     response = client.post("/tasks", json={
@@ -181,7 +183,7 @@ def test_create_task_with_valid_completed_at(client):
 
 # Let's add this test for updating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_with_completed_at_date(client, completed_task):
     # Act
     response = client.put("/tasks/1", json={
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..594df9ffd 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,7 @@
 import pytest
+from app.models.goal import Goal
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -46,22 +46,25 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @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()
 
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert response_body == {"details": "Goal not found"}
+    assert Goal.query.all() == []
     # ---- Complete Test ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,34 +83,52 @@ def test_create_goal(client):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
-
+    response = client.put("/goals/1", json={
+        "title": "This was my tutor's idea"
+    })
+    response_body = response.get_json()
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 200
     # assertion 2 goes here
+    assert response_body == {
+        "goal": {
+            "id": 1,
+            "title": "This was my tutor's idea"
+        }
+    }
+    goal = Goal.query.get(1)
     # assertion 3 goes here
+    assert goal.title == "This was my tutor's idea"
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "This was my tutor's idea"
+    })
+    response_body = response.get_json()
 
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert response_body == {"details": "Goal not found"}
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -124,27 +145,33 @@ def test_delete_goal(client, one_goal):
     response = client.get("/goals/1")
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert Goal.query.get(1) == None
+    assert response_body == {"details": f'Goal 1 "Build a habit of going outside daily" successfully deleted'}
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
 
     # Act
     # ---- Complete Act Here ----
-
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert Goal.query.get(1) == None
     # assertion 2 goes here
+    assert response.status_code == 404
+    assert response_body == {"details": "Goal not found"}
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..bea44514d 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert len(Goal.query.get(1).tasks) == 3
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on
     assert len(Goal.query.get(1).tasks) == 2
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_goal(client):
     # Act
     response = client.get("/goals/1/tasks")
@@ -51,13 +51,15 @@ def test_get_tasks_for_specific_goal_no_goal(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert len(response_body) == 1
+    assert response_body == {"details": "Goal not found"}
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +76,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -99,7 +101,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     response = client.get("/tasks/1")
     response_body = response.get_json()