diff --git a/app/__init__.py b/app/__init__.py
index 3c581ceeb..cd66873bf 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,6 +1,8 @@
-from flask import Flask
+from flask import Flask, request, jsonify
 from .db import db, migrate
 from .models import task, goal
+from .routes.task_routes import bp as tasks_bp
+from .routes.goal_routes import bp as goals_bp
 import os
 
 def create_app(config=None):
@@ -18,5 +20,9 @@ def create_app(config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+
 
     return app
+
diff --git a/app/models/goal.py b/app/models/goal.py
index 44282656b..211f41f8f 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,29 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from datetime import datetime
+from app.routes.utilities_routes import create_model, validate_model
+from typing import Optional
+from sqlalchemy import ForeignKey
+# from app.models.task import Task
 from ..db import db
 
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    tasks: Mapped[list["Task"]] = relationship("Task",back_populates="goal")
+
+
+
+    def to_dict(self):
+        goal_as_dict = {}
+        goal_as_dict["id"] = self.id
+        goal_as_dict["title"] = self.title
+        
+        return goal_as_dict
+
+
+    @classmethod
+    def from_dict(cls, goal_data):
+        new_goal = cls(
+            title=goal_data["title"]
+        )
+        return new_goal
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 5d99666a4..b9701c5ce 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,45 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
+from datetime import datetime
+from typing import Optional
+from sqlalchemy import ForeignKey
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    description: Mapped[str]
+    completed_at: Mapped[Optional[datetime]]
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped["Goal"] = relationship("Goal", back_populates="tasks")
+    
+
+
+    def to_dict(self):
+        task_as_dict = {
+            "id": self.id, 
+            "title": self.title, 
+            "description": self.description, 
+            "is_complete": check_for_completion(self)
+        }
+        if self.goal_id:
+            task_as_dict["goal_id"] = self.goal_id
+        
+        return task_as_dict
+
+
+    @classmethod
+    def from_dict(cls, task_data):
+        goal_id = task_data.get("goal_id")
+        
+        new_task = cls(
+            title=task_data["title"],
+            description=task_data["description"],
+            goal_id = goal_id
+        )
+        return new_task
+    
+def check_for_completion(self):
+    if self.completed_at is not None:
+        return True
+    else :
+        return False
\ No newline at end of file
diff --git a/app/routes/__init__.py b/app/routes/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py
index 3aae38d49..984ab2427 100644
--- a/app/routes/goal_routes.py
+++ b/app/routes/goal_routes.py
@@ -1 +1,107 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, abort, make_response, request, Response
+
+from app.models.goal import Goal
+from app.models.task import Task
+from ..db import db
+from datetime import datetime
+from app.routes.utilities_routes import *
+
+bp = Blueprint("goal_bp",__name__, url_prefix= "/goals")
+
+
+####################################################################
+######################### Create FUNCTIONS #########################
+####################################################################
+@bp.post("")
+def create_goal():
+    request_body = request.get_json()
+    
+    if not request_body or not request_body.get("title"):
+        return make_response({"details": "Invalid data: missing title"}, 400) 
+    
+    goal = create_model(Goal, request_body)
+    return make_response(goal, 201)
+
+
+@bp.post("/<goal_id>/tasks")
+def post_task_ids_to_goal(goal_id):
+    request_body = request.get_json() 
+    goal = validate_model(Goal, goal_id)
+
+    task_ids = request_body.get("task_ids", [])
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        goal.tasks.append(task)
+    
+    db.session.commit()
+
+    response_body = { 
+        "id": goal.id, 
+        "task_ids": [task.id for task in goal.tasks]
+    }
+
+
+    return response_body, 200
+
+
+####################################################################
+######################### READ FUNCTIONS #########################
+####################################################################
+
+@bp.get("")
+def get_goals():
+    request_arguements = request.args
+    goals = get_models_with_filters(Goal, request_arguements)
+    if not goals: 
+        return make_response([], 200)
+    
+    return make_response(goals, 200)
+
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    try: 
+        goal = validate_model(Goal, goal_id)
+        return make_response({"goal": goal.to_dict()}, 200)
+    except: 
+        return make_response({"details": f"Goal {goal_id} not found"}, 404)
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_for_specific_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    response_body = goal.to_dict()
+    response_body["tasks"] = [task.to_dict() for task in goal.tasks]
+    return response_body, 200
+    
+####################################################################
+######################### UPDATE FUNCTIONS #########################
+####################################################################
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+
+    goal_title = request_body.get("title")
+    if not goal_title: 
+        return make_response({"details": "Invalid request: missing title"}, 400)
+    goal.title = goal_title 
+    db.session.commit()
+
+    return make_response({"goal": goal.to_dict()}, 200)
+
+
+####################################################################
+######################### DELETE FUNCTIONS #########################
+####################################################################
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    goal_id = goal.id
+    goal_title = goal.title 
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    response_body = { 
+        "details": f'Goal {goal_id} "{goal_title}" successfully deleted'
+    }
+    return make_response(response_body, 200)
diff --git a/app/routes/slack_functions.py b/app/routes/slack_functions.py
new file mode 100644
index 000000000..e04e9256c
--- /dev/null
+++ b/app/routes/slack_functions.py
@@ -0,0 +1,27 @@
+from flask import request, jsonify, abort, make_response
+import requests
+import os
+
+
+def send_message(message, slack_channel, slack_url, slack_api_token):
+    headers = { 
+         'Authorization': f'Bearer {slack_api_token}',
+         'Content-Type': 'application/json'
+    }
+    payload = {
+        "channel": slack_channel,
+        "text": message
+        }   
+        
+    response = requests.post(slack_url, json=payload, headers= headers)
+    if response.status_code != 200 or response.json().get("ok") is not True: 
+        print("Failed to send Slack message: error unknown")
+
+def send_message_with_config(message): 
+        slack_channel = os.environ.get("SLACK_CHANNEL")
+        slack_url = os.environ.get("SLACK_URL")
+        slack_api_token = os.getenv("SLACK_BOT_TOKEN")
+
+        return send_message(message, slack_channel, slack_url, slack_api_token)
+
+    
\ No newline at end of file
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
index 3aae38d49..4842f6d52 100644
--- a/app/routes/task_routes.py
+++ b/app/routes/task_routes.py
@@ -1 +1,91 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, abort, make_response, request, Response
+from app.models.task import Task
+from app.routes.utilities_routes import create_model, validate_model, get_models_with_filters, delete_model
+from app.routes.slack_functions import send_message_with_config
+from datetime import datetime, timezone
+from ..db import db
+import os
+
+
+bp = Blueprint("task_bp", __name__, url_prefix="/tasks")
+invalid_data_response = ({"details": "Invalid data"}, 400)
+
+#create a new task in database
+@bp.post("")
+def create_task(): 
+    request_body = request.get_json()
+    return create_model(Task, request_body)
+
+@bp.get("")
+def get_tasks(): 
+    request_arguments = request.args
+    return get_models_with_filters(Task, request_arguments), 200
+
+
+#get task by task id: 
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_model(Task, task_id)
+    task_dict = task.to_dict()
+    response = {"task":task_dict}
+
+    return response,200
+
+#update task
+@bp.put("/<task_id>")
+def update_task(task_id):
+    task = validate_model(Task, task_id)
+    
+    request_body = request.get_json()
+    title = request_body.get("title")
+    description = request_body.get("description")
+
+    if not title or not description: 
+        return {"error": "Missing required fields: 'title' or 'description'"}, 400
+    task.title = title 
+    task.description = description 
+
+    completed_at = request_body.get("completed_at", task.completed_at)
+    task.completed_at = completed_at
+
+    db.session.commit()
+    
+    response = {"task":task.to_dict()}
+    return response, 200
+
+
+#Delete task
+@bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = validate_model(Task, task_id)
+    return delete_model(Task, task)
+
+
+#route 2
+@bp.patch("/<task_id>/mark_complete")
+def mark_complete(task_id):
+    task = validate_model(Task, task_id)
+
+    utc_now = datetime.now(timezone.utc)
+    task.completed_at = utc_now
+    message = f"Task {task.title} has been marked as complete!"
+    slack_response= send_message_with_config(message)
+    db.session.commit()
+    response = {"task": task.to_dict()}
+    if slack_response == None:
+    # if slack_response.status_code != 200 or not slack_response.json().get("ok"): 
+        # error_msg = slack_response.json().get("errror", "Unknown error")
+        print("slack_error : Failed to send slack Notification")
+
+    return response, 200 
+
+
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_incomplete(task_id):
+    task = validate_model(Task, task_id)
+    task.completed_at = None
+    db.session.commit()
+    response = {"task": task.to_dict()}
+    return make_response(response,200)
+
+
diff --git a/app/routes/utilities_routes.py b/app/routes/utilities_routes.py
new file mode 100644
index 000000000..d96ffd698
--- /dev/null
+++ b/app/routes/utilities_routes.py
@@ -0,0 +1,64 @@
+from flask import abort, make_response
+from app import db
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        response = {"error": f"{cls.__name__} {model_id} invalid"}
+        abort(make_response(response, 400))
+
+    query = db.select(cls).where(cls.id == model_id)
+    model = db.session.scalar(query)
+    
+    if not model: 
+        response = {"details": f"{cls.__name__} {model_id} not found"}
+        abort(make_response(response, 404))
+
+    return model
+
+def create_model(cls, model_data):
+    try: 
+        new_model = cls.from_dict(model_data)
+
+    except KeyError as error: 
+        response = {"details": "Invalid data"}        
+        abort(make_response(response, 400))
+    
+    db.session.add(new_model)
+    db.session.commit()
+
+    dict=cls.to_dict(new_model)
+
+    response = {((cls.__name__).lower()):dict}
+    return(make_response(response,201))
+
+def get_models_with_filters(cls, filters=None):
+    query = db.select(cls)
+    if filters:
+        for attribute, value in filters.items():
+            if attribute != "sort":
+                if hasattr(cls,attribute): 
+                    query = query.where(getattr(cls, attribute).ilike(f"%{value}%"))
+            else: 
+                if value == "asc": 
+                    query = query.order_by(cls.title.asc())
+                elif value == "desc":
+                    query = query.order_by(cls.title.desc())
+
+    models = db.session.scalars(query.order_by(cls.id))
+    models_response = [model.to_dict() for model in models]
+    return models_response            
+
+
+def delete_model(cls,model):
+    model_id = model.id
+    model_title = model.title
+
+    db.session.delete(model)
+    db.session.commit()
+
+    details = f"{cls.__name__} {model_id} \"{model_title}\" successfully deleted"
+    response_body = {"details": details}
+    return response_body
+
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/4d9278f9c192_.py b/migrations/versions/4d9278f9c192_.py
new file mode 100644
index 000000000..cc8d558ba
--- /dev/null
+++ b/migrations/versions/4d9278f9c192_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 4d9278f9c192
+Revises: e53a06306936
+Create Date: 2024-10-31 18:11:00.264935
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '4d9278f9c192'
+down_revision = 'e53a06306936'
+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.drop_column('is_complete')
+
+    # ### 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.add_column(sa.Column('is_complete', sa.BOOLEAN(), autoincrement=False, nullable=True))
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/88ee6863204d_.py b/migrations/versions/88ee6863204d_.py
new file mode 100644
index 000000000..b013d8cad
--- /dev/null
+++ b/migrations/versions/88ee6863204d_.py
@@ -0,0 +1,40 @@
+"""empty message
+
+Revision ID: 88ee6863204d
+Revises: 4d9278f9c192
+Create Date: 2024-11-07 23:39:51.848275
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '88ee6863204d'
+down_revision = '4d9278f9c192'
+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))
+
+    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')
+
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.drop_column('title')
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/9b364957f065_added_task_model.py b/migrations/versions/9b364957f065_added_task_model.py
new file mode 100644
index 000000000..a6344eed2
--- /dev/null
+++ b/migrations/versions/9b364957f065_added_task_model.py
@@ -0,0 +1,40 @@
+"""added task model
+
+Revision ID: 9b364957f065
+Revises: 
+Create Date: 2024-10-31 14:46:39.562704
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9b364957f065'
+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=False),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.Column('is_complete', sa.Boolean(), nullable=False),
+    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/migrations/versions/e53a06306936_.py b/migrations/versions/e53a06306936_.py
new file mode 100644
index 000000000..cfad65167
--- /dev/null
+++ b/migrations/versions/e53a06306936_.py
@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: e53a06306936
+Revises: 9b364957f065
+Create Date: 2024-10-31 17:07:18.921981
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e53a06306936'
+down_revision = '9b364957f065'
+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.alter_column('is_complete',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+
+    # ### 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.alter_column('is_complete',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+
+    # ### end Alembic commands ###
diff --git a/tests/conftest.py b/tests/conftest.py
index e370e597b..eec1fa135 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -57,14 +57,14 @@ def one_task(app):
 def three_tasks(app):
     db.session.add_all([
         Task(title="Water the garden 🌷", 
-             description="", 
-             completed_at=None),
+            description="", 
+            completed_at=None),
         Task(title="Answer forgotten email 📧", 
-             description="", 
-             completed_at=None),
+            description="", 
+            completed_at=None),
         Task(title="Pay my outstanding tickets 😭", 
-             description="", 
-             completed_at=None)
+            description="", 
+            completed_at=None)
     ])
     db.session.commit()
 
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..0c5e29ae5 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -1,8 +1,9 @@
 from app.models.task import Task
+
 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 +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")
@@ -32,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")
@@ -51,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")
@@ -59,14 +60,11 @@ def test_get_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"details": "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_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +91,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={
@@ -101,7 +99,6 @@ def test_update_task(client, one_task):
         "description": "Updated Test Description",
     })
     response_body = response.get_json()
-
     # Assert
     assert response.status_code == 200
     assert "task" in response_body
@@ -114,12 +111,16 @@ def test_update_task(client, one_task):
         }
     }
     task = Task.query.get(1)
+
     assert task.title == "Updated Task Title"
     assert task.description == "Updated Test Description"
     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 +131,12 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"details": "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 +151,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")
@@ -160,16 +159,11 @@ 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 == {"details" : "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 +180,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 32d379822..758af540d 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
     """
@@ -22,10 +22,9 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     """
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
-
-        # Act
+    # Act
         response = client.patch("/tasks/1/mark_complete")
-    response_body = response.get_json()
+        response_body = response.get_json()
 
     # Assert
     assert response.status_code == 200
@@ -42,7 +41,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 +61,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 +98,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 +118,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")
@@ -127,14 +126,9 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"details" : "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_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -142,8 +136,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 == {"details" : "Task 1 not found"}
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..53a2efd27 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")
@@ -24,12 +24,12 @@ def test_get_goals_one_saved_goal(client, one_goal):
     assert response_body == [
         {
             "id": 1,
-            "title": "Build a habit of going outside daily"
+            "title": "Build a habit of going outside daily",
         }
     ]
 
 
-@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,18 @@ 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 == {"details": "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 +76,35 @@ 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": "make my bed every day"
+    })
+    response_body = response.get_json()
+    
+    assert response.status_code == 200
+    assert "goal" in response_body
+    updated_goal = client.get("/goals/1")
+    updated_goal_body = updated_goal.get_json()
+    assert updated_goal_body["goal"]["title"] == "make my bed every day"
+
 
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- 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")
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json ={
+        "title": "make my bed every day"
+    })
+    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 == {"details": "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 +119,25 @@ def test_delete_goal(client, one_goal):
 
     # Check that the goal was deleted
     response = client.get("/goals/1")
+    response_body = response.get_json()
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {
+        "details": "Goal 1 not 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/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 == {
+        "details": "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_missing_title(client):
     # Act
     response = client.post("/goals", json={})
@@ -152,6 +145,7 @@ def test_create_goal_missing_title(client):
 
     # Assert
     assert response.status_code == 400
+    assert "details" in response_body
     assert response_body == {
-        "details": "Invalid data"
+        "details": "Invalid data: missing title"
     }
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..59a3fd04d 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={
@@ -10,7 +10,6 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     })
     response_body = response.get_json()
 
-    # Assert
     assert response.status_code == 200
     assert "id" in response_body
     assert "task_ids" in response_body
@@ -23,7 +22,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 +41,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,19 +49,16 @@ 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")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {
+        "details": "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_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
     response_body = response.get_json()
-
     # Assert
     assert response.status_code == 200
     assert "tasks" in response_body
@@ -74,11 +70,12 @@ 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")
     response_body = response.get_json()
+  
 
     # Assert
     assert response.status_code == 200
@@ -99,7 +96,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()