diff --git a/app/__init__.py b/app/__init__.py
index 3c581ceeb..b8cd1f74c 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,7 +1,10 @@
+from .models import task, goal
 from flask import Flask
 from .db import db, migrate
-from .models import task, goal
 import os
+from app.routes.task_routes import bp as task_bp
+from app.routes.goal_routes import bp as goal_bp
+
 
 def create_app(config=None):
     app = Flask(__name__)
@@ -18,5 +21,9 @@ def create_app(config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from app.routes.task_routes import bp as task_bp
+    from app.routes.goal_routes import bp as goal_bp
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goal_bp)
 
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 44282656b..9a99229a3 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,21 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
 
+
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(db.String, nullable=False)
+    tasks: Mapped[list["Task"]] = relationship(back_populates="goal")
+
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "title": self.title
+        }
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(title=data["title"])
+
+
diff --git a/app/models/task.py b/app/models/task.py
index 5d99666a4..89e3788f2 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,41 @@
-from sqlalchemy.orm import Mapped, mapped_column
 from ..db import db
+from datetime import datetime
+from typing import Optional
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(db.String, nullable=False)
+    description: Mapped[str] = mapped_column(db.String)
+    completed_at: Mapped[Optional[datetime]] = mapped_column(db.DateTime)
+    goal_id: Mapped[Optional[int]] = mapped_column(db.ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+
+
+    def to_dict(self):
+        task_dict = {
+        "id": self.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):
+        return cls(
+            title=data["title"],
+            description=data["description"],
+            completed_at=None
+        )
+    
+    @property
+    def is_complete(self):
+        return self.completed_at is not None
\ No newline at end of file
diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py
index 3aae38d49..afc2284fb 100644
--- a/app/routes/goal_routes.py
+++ b/app/routes/goal_routes.py
@@ -1 +1,95 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, request, jsonify, Response
+from app.models.goal import Goal
+from ..db import db
+from app.models.task import Task
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@bp.post("/<goal_id>/tasks")
+def assign_tasks_to_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    request_body = request.get_json()
+    task_ids = request_body.get("task_ids", [])
+
+    goal.tasks = [] 
+    for task_id in task_ids:
+        task = db.session.get(Task, task_id)
+        if task:
+            goal.tasks.append(task)
+
+    db.session.commit()
+
+    return jsonify({
+        "id": goal.id,
+        "task_ids": task_ids
+    }), 200
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_for_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    goal_dict = goal.to_dict()
+    goal_dict["tasks"] = [task.to_dict() for task in goal.tasks]
+
+    return jsonify(goal_dict), 200
+
+# CREATE a goal
+@bp.post("")
+def create_goal():
+    data = request.get_json()
+
+    if "title" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    new_goal = Goal.from_dict(data)
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return jsonify({"goal": new_goal.to_dict()}), 201
+
+# GET all goals
+@bp.get("")
+def get_goals():
+    goals = db.session.scalars(db.select(Goal)).all()
+    return jsonify([goal.to_dict() for goal in goals])
+
+# GET one goal
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    return jsonify({"goal": goal.to_dict()})
+
+# UPDATE a goal
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    data = request.get_json()
+    if "title" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    goal.title = data["title"]
+    db.session.commit()
+    return jsonify({"goal": goal.to_dict()})
+
+# DELETE a goal
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = db.session.get(Goal, goal_id)
+    if not goal:
+        return jsonify({"message": f"No goal with ID {goal_id} found"}), 404
+
+    db.session.delete(goal)
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
index 3aae38d49..d94d84067 100644
--- a/app/routes/task_routes.py
+++ b/app/routes/task_routes.py
@@ -1 +1,143 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, request, jsonify, Response
+from app.models.task import Task
+from ..db import db
+from datetime import datetime, UTC
+from app.slack_helper import post_to_slack
+#from dotenv import load_dotenv
+
+
+import os
+import requests
+#load_dotenv()
+
+
+
+bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+# Helper: safely get a task by ID or return a 404 JSON response
+def get_task_or_abort(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return jsonify({"message": "Invalid ID"}), 400
+
+    task = db.session.get(Task, task_id)
+    if not task:
+        return jsonify({"message": f"No task with ID {task_id} found"}), 404
+
+    return task
+
+# CREATE: POST /tasks
+@bp.post("")
+def create_task():
+    data = request.get_json()
+
+    if "title" not in data or "description" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    new_task = Task.from_dict(data)
+    db.session.add(new_task)
+    db.session.commit()
+
+    return jsonify({"task": new_task.to_dict()}), 201
+
+# READ ALL: GET /tasks
+@bp.get("")
+def get_all_tasks():
+    sort_order = request.args.get("sort")
+    title_filter = request.args.get("title")
+
+    stmt = db.select(Task)
+
+    if title_filter:
+        stmt = stmt.where(Task.title.ilike(f"%{title_filter}%"))
+
+    if sort_order == "asc":
+        stmt = stmt.order_by(Task.title.asc())
+    elif sort_order == "desc":
+        stmt = stmt.order_by(Task.title.desc())
+    else:
+        stmt = stmt.order_by(Task.id.asc())  # fallback sort
+
+    tasks = db.session.scalars(stmt).all()
+
+    return jsonify([task.to_dict() for task in tasks])
+
+
+# READ ONE: GET /tasks/<task_id>
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task  # return 404 or 400 response
+    return jsonify({"task": task.to_dict()})
+
+# UPDATE: PUT /tasks/<task_id>
+@bp.put("/<task_id>")
+def update_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task
+
+    data = request.get_json()
+    if "title" not in data or "description" not in data:
+        return jsonify({"details": "Invalid data"}), 400
+
+    task.title = data["title"]
+    task.description = data["description"]
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+# DELETE: DELETE /tasks/<task_id>
+@bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = get_task_or_abort(task_id)
+    if not isinstance(task, Task):
+        return task
+
+    db.session.delete(task)
+    db.session.commit()
+    return Response(status=204, mimetype="application/json")
+
+# PATCH /tasks/<task_id>/mark_complete
+@bp.patch("/<task_id>/mark_complete")
+def mark_task_complete(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return {"message": "Invalid task ID"}, 400
+    task = db.session.get(Task, task_id)
+    if not task:
+        return {"message": f"No task with ID {task_id} found"}, 404
+
+    task.completed_at = datetime.now(UTC)
+    db.session.commit()
+
+    # Send Slack message
+    post_to_slack(f"Someone just completed the task: {task.title}")
+    return Response(status=204, mimetype="application/json")
+
+
+    #slack_url = os.environ.get("SLACK_WEBHOOK_URL")
+    #if slack_url:
+      #  slack_message = {"text": f"Someone just completed the task: {task.title}"}
+       # requests.post(slack_url, json=slack_message)
+
+    
+# PATCH /tasks/<task_id>/mark_incomplete
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_task_incomplete(task_id):
+    try:
+        task_id = int(task_id)
+    except ValueError:
+        return {"message": "Invalid task ID"}, 400
+    task = db.session.get(Task, task_id)
+    if not task:
+        return {"message": f"No task with ID {task_id} found"}, 404
+
+
+    task.completed_at = None
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
\ No newline at end of file
diff --git a/app/slack_helper.py b/app/slack_helper.py
new file mode 100644
index 000000000..ef54aee1d
--- /dev/null
+++ b/app/slack_helper.py
@@ -0,0 +1,23 @@
+import os
+import requests
+
+def post_to_slack(message):
+    slack_token = os.environ.get("SLACK_BOT_TOKEN")
+    slack_channel = os.environ.get("SLACK_CHANNEL_ID")
+
+    if not slack_token or not slack_channel:
+        return
+
+    headers = {
+        "Authorization": f"Bearer {slack_token}",
+        "Content-Type": "application/json"
+    }
+
+    slack_message = {
+        "channel": slack_channel,
+        "text": message
+    }
+
+    response = requests.post("https://slack.com/api/chat.postMessage", json=slack_message, headers=headers)
+    print("Slack response status:", response.status_code)
+    print("Slack response body:", response.text)
\ No newline at end of file
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..0e0484415
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Single-database configuration for Flask.
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..ec9d45c26
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,50 @@
+# 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,flask_migrate
+
+[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
+
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[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..4c9709271
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,113 @@
+import logging
+from logging.config import fileConfig
+
+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')
+
+
+def get_engine():
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine()
+    except (TypeError, AttributeError):
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engine
+
+
+def get_engine_url():
+    try:
+        return get_engine().url.render_as_string(hide_password=False).replace(
+            '%', '%%')
+    except AttributeError:
+        return str(get_engine().url).replace('%', '%%')
+
+
+# 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', get_engine_url())
+target_db = current_app.extensions['migrate'].db
+
+# 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 get_metadata():
+    if hasattr(target_db, 'metadatas'):
+        return target_db.metadatas[None]
+    return target_db.metadata
+
+
+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=get_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.')
+
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
+    connectable = get_engine()
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=get_metadata(),
+            **conf_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/22a948019e1c_add_goal_model.py b/migrations/versions/22a948019e1c_add_goal_model.py
new file mode 100644
index 000000000..ebf3bc3bb
--- /dev/null
+++ b/migrations/versions/22a948019e1c_add_goal_model.py
@@ -0,0 +1,32 @@
+"""Add Goal model
+
+Revision ID: 22a948019e1c
+Revises: ab395c17ab17
+Create Date: 2025-05-09 19:23:40.814301
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '22a948019e1c'
+down_revision = 'ab395c17ab17'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('title', sa.String(), nullable=False))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.drop_column('title')
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/9db1dadc772d_add_goal_id_to_task.py b/migrations/versions/9db1dadc772d_add_goal_id_to_task.py
new file mode 100644
index 000000000..5d537cf57
--- /dev/null
+++ b/migrations/versions/9db1dadc772d_add_goal_id_to_task.py
@@ -0,0 +1,34 @@
+"""Add goal_id to Task
+
+Revision ID: 9db1dadc772d
+Revises: 22a948019e1c
+Create Date: 2025-05-09 19:50:59.894947
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9db1dadc772d'
+down_revision = '22a948019e1c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('goal_id')
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ab395c17ab17_create_task_model.py b/migrations/versions/ab395c17ab17_create_task_model.py
new file mode 100644
index 000000000..819b16b1b
--- /dev/null
+++ b/migrations/versions/ab395c17ab17_create_task_model.py
@@ -0,0 +1,39 @@
+"""Create Task model
+
+Revision ID: ab395c17ab17
+Revises: 
+Create Date: 2025-05-08 18:56:44.869336
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ab395c17ab17'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('task',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('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 55475db79..0a4a013f6 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -3,7 +3,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")
@@ -14,7 +14,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")
@@ -33,7 +33,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")
@@ -52,7 +52,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")
@@ -61,13 +61,13 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"message": "No task with ID 1 found"}
     # *****************************************************************
     # **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_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -97,7 +97,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={
@@ -117,7 +117,7 @@ def test_update_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_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -129,13 +129,10 @@ def test_update_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": "No task with ID 1 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_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -146,7 +143,7 @@ def test_delete_task(client, one_task):
     query = db.select(Task).where(Task.id == 1)
     assert db.session.scalar(query) == 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")
@@ -155,15 +152,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": "No task with ID 1 found"}
 
     assert db.session.scalars(db.select(Task)).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={
@@ -180,7 +174,7 @@ def test_create_task_must_contain_title(client):
     assert db.session.scalars(db.select(Task)).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 d7d441695..b1ce3e806 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -6,7 +6,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
     """
@@ -34,7 +34,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     assert db.session.scalar(query).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")
@@ -46,7 +46,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
     assert db.session.scalar(query).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
     """
@@ -74,7 +74,7 @@ def test_mark_complete_on_completed_task(client, completed_task):
     query = db.select(Task).where(Task.id == 1)
     assert db.session.scalar(query).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")
@@ -86,7 +86,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     assert db.session.scalar(query).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")
@@ -95,13 +95,10 @@ 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": "No task with ID 1 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")
@@ -110,7 +107,4 @@ 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": "No task with ID 1 found"}
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 222d10cf0..1fe20751e 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.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_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,14 +46,17 @@ 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 = client.get("/goals/999")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
+    assert response.status_code == 404
+    assert response_body == {
+        "message": "No goal with ID 999 found"
+    }
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
@@ -61,7 +64,7 @@ def test_get_goal_not_found(client):
     # ---- 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,23 +83,41 @@ 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
-    # ---- 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 response_body == {
+        "goal": {
+            "id": 1,
+            "title": "Updated Goal Title"
+        }
+    }
+    get_response = client.get("/goals/1")
+    assert get_response.get_json()["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
+    response = client.put("/goals/999", json={
+        "title": "This shouldn't work"
+    })
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 404
+    assert response_body == {
+        "message": "No goal with ID 999 found"
+    }
     # Act
     # ---- Complete Act Here ----
 
@@ -107,7 +128,7 @@ def test_update_goal_not_found(client):
     # ---- 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")
@@ -122,27 +143,26 @@ def test_delete_goal(client, one_goal):
     response_body = response.get_json()
     assert "message" in response_body
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
+    assert response_body == {
+        "message": "No goal with ID 1 found"
+    }
+  
 
-@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/999")
+    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": "No goal with ID 999 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_missing_title(client):
     # Act
     response = client.post("/goals", json={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 0317f835a..161353982 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -3,7 +3,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={
@@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert len(db.session.scalar(query).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={
@@ -45,7 +45,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on
     assert len(db.session.scalar(query).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")
@@ -54,13 +54,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")
+    assert response_body == {
+        "message": "No goal with ID 1 found"
+    }
     # *****************************************************************
     # **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")
@@ -77,7 +79,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")
@@ -102,7 +104,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()
diff --git a/wsgi.py b/wsgi.py
new file mode 100644
index 000000000..b3c1b8f10
--- /dev/null
+++ b/wsgi.py
@@ -0,0 +1,2 @@
+from app import create_app
+app = create_app()
\ No newline at end of file