diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..9be2c8014 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -14,6 +14,8 @@ def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
+    #app.config["SLACK_API_KEY"] = os.environ.get("SLACK_API_KEY")
+
     if test_config is None:
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_DATABASE_URI")
@@ -30,5 +32,9 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from app.routes.task import task_bp
+    app.register_blueprint(task_bp)
+    from app.routes.goal import goal_bp
+    app.register_blueprint(goal_bp)
 
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..7a6f3e281 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,4 +2,20 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal", lazy = True)
+
+    def make_dict(self):
+        """return a ditionary with all attributes of a goal"""
+        goal_dict = {
+            "id": self.id,
+            "title": self.title
+        }
+        return goal_dict
+
+    @classmethod
+    def from_dict(cls, data_dict):
+        new_object = cls(
+            title = data_dict["title"])
+        return new_object
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..c3a2cdc09 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,46 @@
 from app import db
+import os
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    task_id = db.Column(db.Integer, primary_key=True, autoincrement = True)
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, default = None)
+    is_complete = db.Column(db.Boolean, default = False)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable = True)
+    goal = db.relationship("Goal", back_populates="tasks" )
+    #project instructions are recommending setting nullable to True. 
+    #where do we do this?
+
+    def make_dict(self):
+        """given a task, return a dictionary
+        with all the attibutes of that task."""
+        #if goal_id is empty, don't include it in dictionary.
+        task_dict = {
+            "id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.is_complete
+        }
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+        return task_dict
+
+    @classmethod
+    def from_dict(cls, data_dict):
+        #make the following a helper function:
+        if "completed_at" in data_dict:
+            completed_at = data_dict["completed_at"]
+            if not completed_at:
+                is_complete = False
+            else:
+                is_complete = True
+        else: is_complete = False
+        #end helper function.
+
+        new_object = cls(
+            title = data_dict["title"],
+            description = data_dict["description"],
+            is_complete = is_complete)
+        return new_object
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/goal.py b/app/routes/goal.py
new file mode 100644
index 000000000..45c6a6663
--- /dev/null
+++ b/app/routes/goal.py
@@ -0,0 +1,106 @@
+from flask import Blueprint, jsonify, abort, make_response, request
+from app.models.goal import Goal
+from app import db
+from app.routes.task import validate_task, Task
+
+goal_bp = Blueprint("goal_bp", __name__, url_prefix = "/goals")
+
+@goal_bp.route("", methods = ["POST"])
+def post_new_goal():
+    request_body = request.get_json()
+    if "title" not in request_body:
+        response_str = "Invalid data"
+        abort(make_response({"details":response_str}, 400))
+    
+    new_goal = Goal.from_dict(request_body)
+    db.session.add(new_goal)
+    db.session.commit()
+    goal_dict = new_goal.make_dict()
+    response = {"goal": goal_dict}
+    return make_response(response, 201)
+
+@goal_bp.route("", methods = ["GET"])
+def get_all_goals():
+    goals = Goal.query.all()
+    response = []
+    for goal in goals:
+        goal_dict = goal.make_dict()
+        response.append(goal_dict)
+    return jsonify(response), 200
+
+@goal_bp.route("/<goal_id>", methods = ["GET"])
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+    goal_dict = goal.make_dict()
+    return make_response({"goal": goal_dict}, 200)
+
+@goal_bp.route("/<goal_id>", methods = ["PUT", "PATCH"])
+def update_goal(goal_id):
+    goal = validate_goal(goal_id)
+    request_body = request.get_json()
+    #This could be a helper function----#
+    if "title" in request_body:
+        goal.title = request_body["title"]
+    else:
+        response_str = f"Invalid data"
+        abort(make_response({"details": response_str}, 400))
+    #end a helper function#
+    db.session.commit()
+    response = {"goal": goal.make_dict()}
+    return make_response(response, 200)
+    
+@goal_bp.route("/<goal_id>", methods = ["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_goal(goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+    response_str = f'Goal {goal_id} "{goal.title}" successfully deleted'
+    response_body = {"details": response_str}
+    return make_response(response_body, 200)
+
+#nested routes:
+@goal_bp.route("/<goal_id>/tasks", methods = ["POST"])
+def create_a_goal_with_tasks(goal_id):
+    new_goal = validate_goal(goal_id)
+    request_body = request.get_json()
+    task_id_list = request_body["task_ids"]
+    #begin helper function
+    #for those tasks, assign them to the goal, 
+    for task_id in task_id_list:
+        task = validate_task(task_id)
+        task.goal_id = goal_id
+    #end helper function
+    db.session.add(new_goal)
+    db.session.commit()
+    response_body = {
+        "id": int(goal_id), #there should be a better way to deal with this.
+        "task_ids": task_id_list}
+    return make_response(response_body, 200)
+
+@goal_bp.route("/<goal_id>/tasks", methods = ["GET"])
+def get_one_goal_with_tasks(goal_id):
+    goal = validate_goal(goal_id)
+    task_list = []
+    for task in goal.tasks:
+        task_list.append(task.make_dict())
+    response = {
+        "id": int(goal_id),  #there should be a better way to do this;
+        "title": goal.title,
+        "tasks": task_list
+    }
+    return jsonify(response), 200
+
+
+#ideally, combine this with validate task, passing in the class as well. 
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except ValueError:
+        response_str = f"Goal {goal_id} must be an integer"
+        abort(make_response({"message": response_str}, 400))
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        response_str = f"Goal {goal_id} not found"
+        abort(make_response({"message": response_str}, 404))
+    return goal
+
diff --git a/app/routes/task.py b/app/routes/task.py
new file mode 100644
index 000000000..c5d9c512c
--- /dev/null
+++ b/app/routes/task.py
@@ -0,0 +1,143 @@
+from flask import Blueprint, jsonify, abort, make_response, request
+from app.models.task import Task
+from app import db
+from sqlalchemy import desc, asc
+from datetime import date
+import os
+import requests
+
+#make a blueprint
+task_bp = Blueprint("task_bp", __name__, url_prefix = "/tasks")
+
+#constants: (refactor to make this from the database later.)
+COL_NAMES = ["title", "description", "is_complete"] #later, add completed ad
+COL_DEFAULTS = [None, "", False]
+COL_NAME_DEFAULT_DICT = dict(zip(COL_NAMES, COL_DEFAULTS))
+
+@task_bp.route("", methods = ["GET"])
+def get_all_tasks():
+    #refactor to helper function
+    sort_order = request.args.get("sort")
+    if sort_order == "desc":
+        tasks = Task.query.order_by(Task.title.desc()).all() #Task.title is just a string??
+    elif sort_order == "asc":
+        tasks = Task.query.order_by(Task.title.asc()).all() #look up doc for asc.
+    else:
+        tasks = Task.query.all()
+    #refactor to helper function end here
+    response = []
+    for task in tasks:
+        task_dict = task.make_dict()
+        response.append(task_dict)
+    return jsonify(response), 200
+
+
+@task_bp.route("/<task_id>", methods = ["GET"])
+def get_one_task(task_id):
+    task = validate_task(task_id)
+    task_dict = task.make_dict()
+    return make_response({"task": task_dict}, 200)
+    
+@task_bp.route("", methods = ["POST"])
+def post_new_task():
+    request_body = request.get_json()
+    #dict_of_field_vals = fill_empties_with_defaults(request_body)
+    if "title" not in request_body or "description" not in request_body:
+        response_str = "Invalid data"
+        abort(make_response({"details":response_str}, 400))
+    if "completed_at" not in request_body:
+        request_body["is_complete"] = False
+
+    new_task = Task.from_dict(request_body)
+    db.session.add(new_task)
+    db.session.commit()
+    task_dict = new_task.make_dict()
+    response = {"task": task_dict}
+    return make_response(response, 201)
+    
+@task_bp.route("/<task_id>", methods = ["PUT", "PATCH"])
+def update_task(task_id):
+    task = validate_task(task_id)
+    request_body = request.get_json()
+    task = update_given_values(task, request_body)
+    db.session.commit()
+    response = {"task": task.make_dict()}  #refactor this line and line 37 above to helper function? or method on class?
+    return make_response(response, 200)
+
+#can the following be combined with the route above?
+@task_bp.route("/<task_id>/<complete_tag>", methods = ["PUT", "PATCH"])
+def update_task_completion(task_id, complete_tag):
+    task = validate_task(task_id)
+    if complete_tag == "mark_complete":
+        task.completed_at = date.today().strftime("%B %d, %Y")
+        task.is_complete = True  #not sure if this line is redundant
+
+        #post a message to slack to say the task is complete.
+        #----------Make the following into a helper function later-----#
+        path = "https://slack.com/api/chat.postMessage"
+        query_params = {
+            "channel" : "task-notifications",
+            "text": "Someone just completed the task " + task.title
+        }
+        headers = {
+            "Authorization" : "Bearer " + os.environ.get("SLACK_API_KEY")
+        }
+
+        response = requests.post(path, params = query_params, headers = headers)
+        #----------end helper function--------------#
+
+    elif complete_tag == "mark_incomplete":
+        task.completed_at = None
+        task.is_complete = False #not sure if this line is redundant
+    db.session.commit()
+    response = {"task": task.make_dict()}
+    return make_response(response, 200)
+
+
+@task_bp.route("/<task_id>", methods = ["DELETE"])
+def delete_task(task_id):
+    task = validate_task(task_id)
+    db.session.delete(task)
+    db.session.commit()
+    response_body = {"details": f'Task {task_id} "{task.title}" successfully deleted'}
+    return make_response(response_body, 200)
+
+#ideally, combine this with validate goal, passing in the class as well. 
+def validate_task(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        response_str = f"Task {task_id} must be an integer"
+        abort(make_response({"message": response_str}, 400))
+    task = Task.query.get(task_id)
+    if not task:
+        response_str = f"Task {task_id} not found"
+        abort(make_response({"message": response_str}, 404))
+    return task
+
+#can I make this a method for Tasks?
+def update_given_values(task, request_body):
+    if "title" in request_body:
+        task.title = request_body["title"]
+    if "description" in request_body:
+        task.description = request_body["description"]
+    if "is_complete" in request_body:
+        task.is_complete = request_body["is_complete"]
+    #can add completed_at when you put that in. 
+    return task
+
+# I used this in my journal.py.  This isn't want the tests are asking for, so I'll delete it. 
+# def fill_empties_with_defaults(request_body):
+#     """Go through entered fields.  
+#     If it has an entry, use that, if not, use the default."""
+#     task_dict = {}
+#     for field, default in COL_NAME_DEFAULT_DICT.items():
+
+#         if field not in request_body:
+#             task_dict[field] = default
+#         else:
+#             task_dict[field] = request_body[field]
+
+#     return task_dict
+
+
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/5f789784c2c0_.py b/migrations/versions/5f789784c2c0_.py
new file mode 100644
index 000000000..916db40a1
--- /dev/null
+++ b/migrations/versions/5f789784c2c0_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 5f789784c2c0
+Revises: ff6611d1de75
+Create Date: 2022-11-03 09:46:40.697550
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '5f789784c2c0'
+down_revision = 'ff6611d1de75'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/7fc34fd31471_.py b/migrations/versions/7fc34fd31471_.py
new file mode 100644
index 000000000..074f04818
--- /dev/null
+++ b/migrations/versions/7fc34fd31471_.py
@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 7fc34fd31471
+Revises: cab89553b1f6
+Create Date: 2022-11-16 12:24:53.476089
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7fc34fd31471'
+down_revision = 'cab89553b1f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('id', sa.Integer(), nullable=False))
+    op.drop_column('goal', 'goal_id')
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['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')
+    op.add_column('goal', sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False))
+    op.drop_column('goal', 'id')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/cab89553b1f6_.py b/migrations/versions/cab89553b1f6_.py
new file mode 100644
index 000000000..eddacbce0
--- /dev/null
+++ b/migrations/versions/cab89553b1f6_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: cab89553b1f6
+Revises: 5f789784c2c0
+Create Date: 2022-11-15 13:23:02.551355
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'cab89553b1f6'
+down_revision = '5f789784c2c0'
+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/ff6611d1de75_.py b/migrations/versions/ff6611d1de75_.py
new file mode 100644
index 000000000..23d455275
--- /dev/null
+++ b/migrations/versions/ff6611d1de75_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: ff6611d1de75
+Revises: 
+Create Date: 2022-11-02 14:01:38.832132
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ff6611d1de75'
+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(), autoincrement=True, 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/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..e46a1bbc6 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,12 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {
+        "message": "Task 1 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_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +92,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 +118,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={
@@ -130,14 +129,10 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Task 1 not found"}
+    
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about 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_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +147,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 +156,12 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
+    assert response_body == {"message": "Task 1 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_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +178,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..c9a76e6b1 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 32d379822..62bb3c6da 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,11 @@ def test_mark_complete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
+    assert response_body == {
+        "message": "Task 1 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,7 +141,6 @@ def test_mark_incomplete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {
+        "message": "Task 1 not found"
+    }
\ No newline at end of file
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..11763e9fa 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
 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 +13,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 +30,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 +47,22 @@ 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")
     # Assert
-    # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+    assert response.status_code == 404
+
+    assert response_body == {
+        "message": "Goal 1 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_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,34 +81,45 @@ 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")
+    
+    # Act
+    response = client.put("/goals/1", json={
+        "title": "Updated Goal Title"
+    })
+    response_body = response.get_json()
+    # Assert
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body == {
+        "goal": {
+            "id": 1,
+            "title": "Updated Goal Title"
+        }
+    }
     # Act
-    # ---- Complete Act Here ----
+    goal = Goal.query.get(1)
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
+    assert goal.title == "Updated Goal Title"
 
 
-@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")
     # 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 == {
+        "message": "Goal 1 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_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -122,29 +134,24 @@ def test_delete_goal(client, one_goal):
 
     # Check that the goal was deleted
     response = client.get("/goals/1")
-    assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert Goal.query.get(1) == None
 
 
-@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")
-
     # 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 == {"message": "Goal 1 not found"}
+    
+    assert Goal.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_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..ed8f6a97f 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")
@@ -50,14 +50,9 @@ def test_get_tasks_for_specific_goal_no_goal(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Goal 1 not found"}
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about 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_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +69,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 +94,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()