diff --git a/.gitignore b/.gitignore
index 4e9b18359..1316f90db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,4 +138,6 @@ dmypy.json
 .pytype/
 
 # Cython debug symbols
-cython_debug/
\ No newline at end of file
+cython_debug/
+
+.idea
\ No newline at end of file
diff --git a/app/__init__.py b/app/__init__.py
index 3c581ceeb..67d4e3b09 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,10 +1,23 @@
+import os
+
+from dotenv import load_dotenv
 from flask import Flask
+
 from .db import db, migrate
 from .models import task, goal
-import os
+from .routes.goal_routes import goal_bp
+from .routes.task_routes import tasks_bp
+from flask_cors import CORS
+
+load_dotenv()
+
 
 def create_app(config=None):
     app = Flask(__name__)
+    CORS(app)
+    CORS(app, resources={r"/*": {"origins": "http://localhost:5173"}})
+
+    app.config['CORS_HEADERS'] = 'Content-Type'
 
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
@@ -16,6 +29,8 @@ def create_app(config=None):
 
     db.init_app(app)
     migrate.init_app(app, db)
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goal_bp)
 
     # Register Blueprints here
 
diff --git a/app/db.py b/app/db.py
index 3ada8d10c..13490885a 100644
--- a/app/db.py
+++ b/app/db.py
@@ -1,6 +1,7 @@
-from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
+from flask_sqlalchemy import SQLAlchemy
+
 from .models.base import Base
 
 db = SQLAlchemy(model_class=Base)
-migrate = Migrate()
\ No newline at end of file
+migrate = Migrate()
diff --git a/app/models/base.py b/app/models/base.py
index 227841686..fa2b68a5d 100644
--- a/app/models/base.py
+++ b/app/models/base.py
@@ -1,4 +1,5 @@
 from sqlalchemy.orm import DeclarativeBase
 
+
 class Base(DeclarativeBase):
-    pass
\ No newline at end of file
+    pass
diff --git a/app/models/goal.py b/app/models/goal.py
index 44282656b..19612c884 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,25 @@
-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(nullable=False)
+    tasks = relationship('Task', back_populates='goal', cascade='all, delete-orphan')
+
+    def to_dict(self, no_tasks=True):
+        result = {"id": self.id, "title": self.title, }
+        if not no_tasks:
+            tasks = []
+            for task in self.tasks:
+                tasks.append(task.to_dict())
+            result["tasks"] = tasks
+        return result
+
+    def from_dict(self, data:dict[str, any]):
+        if id in data:
+            self.id = data.get("id")
+        if "title" in data:
+            self.title = data["title"]
+        return self
diff --git a/app/models/task.py b/app/models/task.py
index 5d99666a4..d986dca98 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,33 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from datetime import datetime
+
+from sqlalchemy import Integer, ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
 from ..db import db
 
+
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(nullable=False)
+    description: Mapped[str]
+    completed_at: Mapped[datetime] = mapped_column(nullable=True)
+
+    goal_id = db.Column(Integer, ForeignKey('goal.id'), nullable=True)
+    goal = relationship('Goal', back_populates='tasks')
+
+    def to_dict(self):
+        result = dict(
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete=self.completed_at is not None)
+        if self.goal is not None:
+            result["goal_id"] = self.goal.id
+        return result
+    def from_dict(self, data):
+        self.id = data["id"]
+        self.title = data["title"]
+        self.description = data["description"]
+        self.goal_id = data["goal_id"]
+        self.completed_at = None if data["is_complete"] == False else datetime.now()
+        return self
\ 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..7f3412f4d 100644
--- a/app/routes/goal_routes.py
+++ b/app/routes/goal_routes.py
@@ -1 +1,103 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, make_response, abort, request
+
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+
+goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals")
+
+def validate_key_in_request(request_body, key, datatype):
+    if key not in request_body or not isinstance(request_body[key], datatype):
+        abort(make_response({"details": "Invalid data"}, 400))
+    return request_body
+
+
+def validate_goal_id(id):
+    if not id.isnumeric():
+        abort(make_response({"details": f" {id} Invalid data"}, 400))
+
+
+@goal_bp.post("")
+def create_goal():
+    request_body = validate_key_in_request(request.get_json(), "title", str)
+    new_goal = Goal().from_dict(request_body)
+    db.session.add(new_goal)
+    db.session.commit()
+    response = {
+        "goal": new_goal.to_dict()
+    }
+    return response, 201
+
+
+@goal_bp.get("")
+def get_all_tasks():
+    title_param = request.args.get("title")
+
+    query = db.select(Goal)
+    if title_param:
+        query = query.where(Goal.title.like(f"%{title_param}"))
+
+    goals = db.session.scalars(query).all()
+    return [goal.to_dict() for goal in goals]
+
+
+
+
+@goal_bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+    return {"goal": goal.to_dict()}
+
+
+@goal_bp.post("/<goal_id>/tasks")
+def set_one_goal_tasks(goal_id):
+    request_body = validate_key_in_request(request.get_json(), "task_ids", list)
+    goal = get_goal_by_id(goal_id)
+    task_ids = request_body.get("task_ids", [])
+
+    tasks = db.session.query(Task).filter(Task.id.in_(task_ids)).all()
+    if len(tasks) != len(task_ids):
+        abort(make_response({"message": "One or more tasks not found"}, 404))
+
+    for task in tasks:
+        task.goal = goal
+
+    db.session.commit()
+
+    return {"id": goal.id, "task_ids": [task.id for task in tasks]}, 200
+
+
+@goal_bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+    request_body = request.get_json()
+    goal.title = request_body["title"]
+    db.session.commit()
+    result = {"goal": goal.to_dict()}
+    return make_response(result, 200)
+
+
+@goal_bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = get_goal_by_id(goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+    response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}
+    return make_response(response, 200)
+
+
+def get_goal_by_id(goal_id):
+    validate_goal_id(goal_id)
+    query = db.select(Goal).where(Goal.id == goal_id)
+    goal = db.session.scalar(query)
+
+    if not goal:
+        response = {"message": f"Goal {goal_id} not found"}
+        abort(make_response(response, 404))
+    return goal
+
+
+@goal_bp.get("/<goal_id>/tasks")
+def get_one_goal_tasks(goal_id):
+    return get_goal_by_id(goal_id).to_dict(False)
+     
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
index 3aae38d49..bb67bb41d 100644
--- a/app/routes/task_routes.py
+++ b/app/routes/task_routes.py
@@ -1 +1,145 @@
-from flask import Blueprint
\ No newline at end of file
+from datetime import datetime
+
+from flask import request, Blueprint, make_response, abort
+from sqlalchemy import asc, desc
+
+from app import db
+from app.models.task import Task
+from app.slack.slack_client import SlackClient
+from app.slack.slackmessage import SlackMessage
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+slack_client = SlackClient()
+
+
+@tasks_bp.post("")
+def create_task():
+    request_body = request.get_json()
+    if "title" not in request_body.keys():
+        abort(make_response({"details": "Invalid data"}, 400))
+    title = request_body["title"]
+    if "description" not in request_body.keys():
+        abort(make_response({"details": "Invalid data"}, 400))
+    description = request_body["description"]
+    new_task = Task(title=title, description=description, completed_at=None)
+    db.session.add(new_task)
+    db.session.commit()
+    response = {
+        "task": new_task.to_dict()
+    }
+    return response, 201
+
+
+@tasks_bp.get("")
+def get_all_tasks():
+    description_param = request.args.get("description")
+    title_param = request.args.get("title")
+    sort_param = request.args.get("sort")
+
+    query = db.select(Task)
+    if description_param:
+        query = query.where(Task.description.like(f"%{description_param}%"))
+
+    if title_param:
+        query = query.where(Task.title.like(f"%{title_param}"))
+    if sort_param == "asc":
+        query = query.order_by(asc(Task.title))
+    elif sort_param == "desc":
+        query = query.order_by(desc(Task.title))
+
+    tasks = db.session.scalars(query).all()
+    tasks_response = [task.to_dict() for task in tasks]
+    return tasks_response
+
+
+def validate_id(id):
+    if not id.isnumeric():
+        abort(make_response({"message": f"Tasks id {id} invalid"}, 400))
+
+
+@tasks_bp.get("/<task_id>")
+def get_one_task(task_id):
+    validate_id(task_id)
+    query = db.select(Task).where(Task.id == task_id)
+    task = db.session.scalar(query)
+
+    if not task:
+        response = {"message": f"{task_id} not found"}
+        abort(make_response(response, 404))
+
+    return {"task": task.to_dict()}
+
+
+@tasks_bp.put("/<task_id>")
+def update_task(task_id):
+    validate_id(task_id)
+    query = db.select(Task).where(Task.id == task_id)
+    task = db.session.scalar(query)
+
+    if task is None:
+        abort(make_response({"message": f"Task {task_id} not found"}, 404))
+
+    request_body = request.get_json()
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    if "is_complete" in request_body.keys() and request_body["is_complete"]:
+        task.completed_at = datetime.now()
+    else:
+        task.completed_at = None
+    db.session.commit()
+    return {
+        "task": task.to_dict()
+    }
+
+
+@tasks_bp.delete("/<task_id>")
+def delete_task(task_id):
+    validate_id(task_id)
+    query = db.select(Task).where(Task.id == task_id)
+    task = db.session.scalar(query)
+    if not task:
+        response = {"message": f"{task_id} not found"}
+        abort(make_response(response, 404))
+
+    db.session.delete(task)
+    db.session.commit()
+
+    return {
+        "details": f'Task {task_id} "{task.title}" successfully deleted'
+    }
+
+
+def change_task_status(task_id, is_completed):
+    task = Task.query.get(task_id)
+    if task is None:
+        response = {"message": f"Task {task_id} not found"}
+        abort(make_response(response, 404))
+
+    if is_completed:
+        completed_date = datetime.now()
+        task_text = f"Someone just completed the task '{task.title}'"
+    else:
+        completed_date = None
+        task_text = f"Someone just marked the task '{task.title}' incomplete"
+
+    CHANNEL_NAME = "task-notifications"
+    notification_messages = SlackMessage(CHANNEL_NAME, task_text)
+    notification_was_sent = slack_client.post_message(notification_messages)
+    if notification_was_sent:
+        Task.query.filter_by(id=task_id).update({Task.completed_at: completed_date})
+        db.session.commit()
+    return task
+
+
+@tasks_bp.patch("/<task_id>/mark_complete")
+def mark_completed_task(task_id):
+    validate_id(task_id)
+    task = change_task_status(task_id, True)
+    return make_response({"task": task.to_dict()}, 200)
+
+
+@tasks_bp.patch("/<task_id>/mark_incomplete")
+def mark_in_complete_task(task_id):
+    validate_id(task_id)
+    task = change_task_status(task_id, False)
+    return make_response({"task": task.to_dict()}, 200)
diff --git a/app/slack/__init__.py b/app/slack/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/slack/slack_client.py b/app/slack/slack_client.py
new file mode 100644
index 000000000..4e750429f
--- /dev/null
+++ b/app/slack/slack_client.py
@@ -0,0 +1,19 @@
+import os
+
+import requests
+
+from app.slack.slackmessage import SlackMessage
+
+
+class SlackClient:
+    def __init__(self):
+        self.token = os.environ.get('SLACK_TOKEN')
+        self.url = "https://slack.com/api"
+        self.headers = {
+            "Authorization": f"Bearer {self.token}",
+            "Content-Type": "application/json"
+        }
+
+    def post_message(self, slack_message: SlackMessage):
+        response = requests.post(f"{self.url}/chat.postMessage", headers=self.headers, json=slack_message.__dict__)
+        return response.status_code == 200
diff --git a/app/slack/slackmessage.py b/app/slack/slackmessage.py
new file mode 100644
index 000000000..b9516616e
--- /dev/null
+++ b/app/slack/slackmessage.py
@@ -0,0 +1,4 @@
+class SlackMessage:
+    def __init__(self, channel, text):
+        self.channel = channel
+        self.text = text
diff --git a/app/sql/__init__.py b/app/sql/__init__.py
new file mode 100644
index 000000000..e69de29bb
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/84021241d86d_.py b/migrations/versions/84021241d86d_.py
new file mode 100644
index 000000000..42bda08fb
--- /dev/null
+++ b/migrations/versions/84021241d86d_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 84021241d86d
+Revises: 
+Create Date: 2024-11-04 20:21:31.081538
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '84021241d86d'
+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.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/8fde84f7f761_.py b/migrations/versions/8fde84f7f761_.py
new file mode 100644
index 000000000..994712c07
--- /dev/null
+++ b/migrations/versions/8fde84f7f761_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 8fde84f7f761
+Revises: f89cd0bb58fb
+Create Date: 2024-11-07 17:58:50.078968
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8fde84f7f761'
+down_revision = 'f89cd0bb58fb'
+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))
+
+    # ### 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_column('goal_id')
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/f89cd0bb58fb_.py b/migrations/versions/f89cd0bb58fb_.py
new file mode 100644
index 000000000..9f9420305
--- /dev/null
+++ b/migrations/versions/f89cd0bb58fb_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: f89cd0bb58fb
+Revises: 84021241d86d
+Create Date: 2024-11-07 15:55:04.854198
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f89cd0bb58fb'
+down_revision = '84021241d86d'
+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/fc2f4d8b90d4_.py b/migrations/versions/fc2f4d8b90d4_.py
new file mode 100644
index 000000000..beb6b8a10
--- /dev/null
+++ b/migrations/versions/fc2f4d8b90d4_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: fc2f4d8b90d4
+Revises: 8fde84f7f761
+Create Date: 2024-11-07 18:05:55.594275
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'fc2f4d8b90d4'
+down_revision = '8fde84f7f761'
+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.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')
+
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index af8fc4cf4..b74492ac8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,3 +24,4 @@ SQLAlchemy==2.0.25
 typing_extensions==4.9.0
 urllib3==2.2.3
 Werkzeug==3.0.1
+flask_cors
\ No newline at end of file
diff --git a/tests/conftest.py b/tests/conftest.py
index e370e597b..060d27ab3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,15 +1,18 @@
+import os
+from datetime import datetime
+
 import pytest
+from dotenv import load_dotenv
+from flask.signals import request_finished
+
 from app import create_app
 from app.db import db
-from flask.signals import request_finished
-from dotenv import load_dotenv
-import os
-from app.models.task import Task
 from app.models.goal import Goal
-from datetime import datetime
+from app.models.task import Task
 
 load_dotenv()
 
+
 @pytest.fixture
 def app():
     # create the app with a test configuration
@@ -42,8 +45,8 @@ def client(app):
 # This fixture creates a task and saves it in the database
 @pytest.fixture
 def one_task(app):
-    new_task = Task(title="Go on my daily walk 🏞", 
-                    description="Notice something new every day", 
+    new_task = Task(title="Go on my daily walk 🏞",
+                    description="Notice something new every day",
                     completed_at=None)
     db.session.add(new_task)
     db.session.commit()
@@ -56,14 +59,14 @@ def one_task(app):
 @pytest.fixture
 def three_tasks(app):
     db.session.add_all([
-        Task(title="Water the garden 🌷", 
-             description="", 
+        Task(title="Water the garden 🌷",
+             description="",
              completed_at=None),
-        Task(title="Answer forgotten email 📧", 
-             description="", 
+        Task(title="Answer forgotten email 📧",
+             description="",
              completed_at=None),
-        Task(title="Pay my outstanding tickets 😭", 
-             description="", 
+        Task(title="Pay my outstanding tickets 😭",
+             description="",
              completed_at=None)
     ])
     db.session.commit()
@@ -75,8 +78,8 @@ def three_tasks(app):
 # valid completed_at date
 @pytest.fixture
 def completed_task(app):
-    new_task = Task(title="Go on my daily walk 🏞", 
-                    description="Notice something new every day", 
+    new_task = Task(title="Go on my daily walk 🏞",
+                    description="Notice something new every day",
                     completed_at=datetime.utcnow())
     db.session.add(new_task)
     db.session.commit()
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..8b7dde46a 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -1,8 +1,6 @@
 from app.models.task import Task
-import pytest
 
 
-@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 +11,6 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@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 +29,6 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@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 +47,6 @@ def test_get_task(client, one_task):
     }
 
 
-@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 +54,9 @@ def test_get_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body["message"] == "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")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +83,6 @@ def test_create_task(client):
     assert new_task.completed_at == None
 
 
-@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 +108,6 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@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 +118,9 @@ 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"] == "Task 1 not found"
 
 
-@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 +135,6 @@ def test_delete_task(client, one_task):
     assert Task.query.get(1) == None
 
 
-@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 +143,10 @@ 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"] == "1 not found"
     assert Task.query.all() == []
 
 
-@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 +163,6 @@ def test_create_task_must_contain_title(client):
     assert Task.query.all() == []
 
 
-@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..399daf4db 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,7 +1,3 @@
-import pytest
-
-
-@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 +25,6 @@ def test_get_tasks_sorted_asc(client, three_tasks):
     ]
 
 
-@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..d9993a094 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -1,11 +1,8 @@
-import unittest
-from unittest.mock import Mock, patch
-from datetime import datetime
+from unittest.mock import patch
+
 from app.models.task import Task
-import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
     """
@@ -42,7 +39,6 @@ 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")
 def test_mark_incomplete_on_complete_task(client, completed_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -62,7 +58,6 @@ 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")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
     """
@@ -99,7 +94,6 @@ 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")
 def test_mark_incomplete_on_incomplete_task(client, one_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -119,7 +113,6 @@ 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")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -127,14 +120,9 @@ 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")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -142,8 +130,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"] == "Task 1 not found"
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..0cb8310cc 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,3 @@
-import pytest
-
-
-@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 +8,6 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@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 +24,6 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@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 +40,14 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
-    pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
-
-    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")
 def test_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,34 +66,35 @@ def test_create_goal(client):
     }
 
 
-@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 Task Title"})
+    response_body = response.get_json()
 
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert not response_body != {
+        "goal": {
+            "id": 1,
+            "title": "Updated Task Title"
+        }}
 
 
-@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": "Non-existent Goal",
+    })
+    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")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -123,28 +110,23 @@ 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")
+    assert response.get_json() == {'message': 'Goal 1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@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 "message" in response_body
+    assert response_body == {'message': 'Goal 1 not found'}
 
 
-@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..a615c80d8 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -1,8 +1,6 @@
 from app.models.goal import Goal
-import pytest
 
 
-@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 +21,6 @@ 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")
 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 +39,6 @@ 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")
 def test_get_tasks_for_specific_goal_no_goal(client):
     # Act
     response = client.get("/goals/1/tasks")
@@ -50,14 +46,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")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +65,6 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@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 +89,6 @@ 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")
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     response = client.get("/tasks/1")
     response_body = response.get_json()