diff --git a/app/__init__.py b/app/__init__.py
index 3c581ceeb..e0b5a7793 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,22 +1,33 @@
 from flask import Flask
 from .db import db, migrate
 from .models import task, goal
+from app.routes.task_routes import bp as tasks_bp
+from app.routes.goal_routes import bp as goals_bp
+from dotenv import load_dotenv
+from flask_cors import CORS
 import os
 
-def create_app(config=None):
+load_dotenv()
+
+def create_app(test_config=None):
     app = Flask(__name__)
+    CORS(app)
+    app.config['CORS_HEADERS'] = 'Content-Type'
 
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
 
-    if config:
+    if test_config:
         # Merge `config` into the app's configuration
         # to override the app's default settings for testing
-        app.config.update(config)
+        app.config.update(test_config)
 
+    # Initialize app with SQLAlchemy and Migrate
     db.init_app(app)
     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..31c8273a2 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,38 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore
 from ..db import db
+from ..routes.task_routes import validate_task
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .task import Task
 
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    tasks: Mapped[list["Task"]] = relationship(back_populates="goal")
+
+
+    def check_goal_tasks(self):
+        tasks_assigned  = []
+        if self.tasks:
+            for task in self.tasks:
+                task = validate_task(task.id)
+                tasks_assigned.append(task.to_nested_dict())
+        
+        return tasks_assigned
+
+    def to_dict(self):
+        goal_to_dict = {}
+        goal_to_dict["id"] = self.id
+        goal_to_dict["title"] = self.title
+        return goal_to_dict
+    
+    def to_nested_dict(self):
+        goal_to_dict = {}
+        goal_to_dict["id"] = self.id
+        goal_to_dict["title"] = self.title
+        if not self.check_goal_tasks():
+            goal_to_dict["tasks"] = []
+        else:
+            goal_to_dict["tasks"] = self.check_goal_tasks()
+        
+        return goal_to_dict
diff --git a/app/models/task.py b/app/models/task.py
index 5d99666a4..3b5b0c75a 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,55 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship # type: ignore
 from ..db import db
+from datetime import datetime
+from sqlalchemy import ForeignKey # type: ignore
+from typing import Optional
+
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .goal import Goal
+
 
 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]] # = completed_at if completed_at is not None
+
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks") 
+
+    
+    def to_dict(self):
+        if not self.completed_at:
+            is_complete = False
+        else:
+            is_complete = True
+        
+        return dict(
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete=is_complete
+            )
+    
+    def to_nested_dict(self):
+        if not self.completed_at:
+            is_complete = False
+        else:
+            is_complete = True
+        
+        task_dictionary = dict(
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete=is_complete
+            )
+        
+        if self.goal_id:
+            task_dictionary["goal_id"] = self.goal_id
+
+        return task_dictionary
+
+
+
+
diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py
index 3aae38d49..faa759153 100644
--- a/app/routes/goal_routes.py
+++ b/app/routes/goal_routes.py
@@ -1 +1,120 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, abort, jsonify, make_response, request
+from app.db import db
+from ..models.goal import Goal
+import requests
+# from .route_utilities import validate_model, create_model, validate_task, validate_goal
+from app.models.task import Task
+from ..routes.task_routes import validate_task
+
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@bp.post("")
+def create_goal():
+
+    try:
+        request_body = request.get_json()
+        title = request_body["title"]
+        
+        new_goal = Goal(title=title)
+
+        db.session.add(new_goal)
+        db.session.commit()
+
+        return {"goal": new_goal.to_dict()}, 201
+    
+    except KeyError as error:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+@bp.get("")
+def get_all_goals():
+
+    query = db.select(Goal).order_by(Goal.id)
+    goals = db.session.scalars(query)
+
+    goals_response = [goal.to_dict() for goal in goals]
+
+    return goals_response
+
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+    response = {"goal": goal.to_dict()}
+    return response
+
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+    goal = validate_goal(goal_id)
+    response = goal.to_nested_dict()
+    return response
+
+# @bp.get("/<goal_id>/tasks")
+# def get_tasks_for_one_goal(goal_id):
+#     goal = validate_goal(goal_id)
+#     return goal.to_nested_dict()
+
+
+
+@bp.post("/<goal_id>/tasks")
+def create_new_tasks_for_goal(goal_id):
+    
+    current_goal = validate_goal(goal_id)
+    request_body = request.get_json()
+    
+        
+    current_goal_tasks = request_body["task_ids"]
+
+    for task in current_goal_tasks:
+        current_task = validate_task(task)
+        # query = db.select(Task).where(current_task.goal_id == goal_id)
+        current_task.goal_id = goal_id
+
+    db.session.commit()
+
+    return {"id": current_goal.id,
+            "task_ids": current_goal_tasks
+        }
+
+
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+
+    goal = validate_goal(goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    response = {"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}
+    return jsonify(response)
+
+    
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = validate_goal(goal_id)
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return {"goal": goal.to_dict()}
+
+
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+    
+    except:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+    query = db.select(Goal).where(Goal.id == goal_id)
+    goal = db.session.scalar(query)
+
+    if not goal:
+        response = {"details": f"Goal {goal_id} not found"}
+        abort(make_response(response, 404))
+
+    return goal
\ No newline at end of file
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
index 3aae38d49..35eab7ef5 100644
--- a/app/routes/task_routes.py
+++ b/app/routes/task_routes.py
@@ -1 +1,160 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, abort, jsonify, make_response, request
+from ..db import db
+from ..models.task import Task
+from datetime import datetime
+# from .route_utilities import validate_model, create_model, validate_task
+import os
+import requests
+
+TOKEN = os.environ.get("SLACK_TOKEN")
+SLACK_CHANNEL=os.environ.get("SLACK_CHANNEL")
+bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+
+@bp.post("")
+def create_task():
+    
+    try:
+        request_body = request.get_json()
+        title = request_body["title"]
+        description = request_body["description"]
+        new_task = Task(title=title, description=description)
+
+        db.session.add(new_task)
+        db.session.commit()
+
+        return new_task.to_dict(), 201
+    
+    except KeyError as error:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+
+
+def send_slack_msg(task_title):
+    """
+    Information obtained from Slack Wep API Docmentation:
+    https://api.slack.com/methods/chat.postMessage
+    """
+    
+    url=os.environ.get("SLACK_URL")
+    headers={
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {TOKEN}"
+    }
+
+    data={
+        "channel": SLACK_CHANNEL,
+        "text": f"Someone just completed the task: {task_title}"
+    }
+
+    requests.post(url, headers=headers, json=data)
+    
+    
+@bp.patch("/<task_id>/mark_complete")
+def mark_task_complete(task_id):
+
+    current_task = validate_task(task_id)
+
+    if not current_task.completed_at:
+        current_task.completed_at = datetime.now()
+
+    send_slack_msg(current_task.title)
+
+    db.session.add(current_task)
+    db.session.commit()
+
+    response = current_task.to_dict()
+
+    return jsonify(response)
+
+
+
+
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_task_incomplete(task_id):
+
+    current_task = validate_task(task_id)
+
+    if current_task.completed_at:
+        current_task.completed_at = None
+
+    db.session.add(current_task)
+    db.session.commit()
+
+    response = {"task": current_task.to_dict()}
+
+    return jsonify(response)
+
+
+@bp.get("")
+def get_tasks_sort_title():
+
+    query = db.select(Task)
+
+    title_sort = request.args.get("sort")
+    if title_sort and title_sort == "asc":
+        query = query.order_by(Task.title)
+    
+    elif title_sort and title_sort == "desc":
+        query = query.order_by(Task.title.desc())
+
+    tasks = db.session.scalars(query)
+    tasks_response = [task.to_dict() for task in tasks]
+
+    return jsonify(tasks_response)
+
+
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_task(task_id)
+    response = {"task": task.to_nested_dict()}
+    return response
+
+
+
+@bp.put("/<task_id>")
+def update_task(task_id):
+    task = validate_task(task_id)
+    request_body = request.get_json()
+
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    
+    db.session.commit()
+
+    return {"task": task.to_dict()} 
+
+@bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = validate_task(task_id)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    response = {"details": f'Task {task_id} "{task.title}" successfully deleted'}
+
+    return jsonify(response)
+
+
+def validate_task(task_id):
+    try:
+        task_id = int(task_id)
+    
+    except:
+        response = {"details": f"Invalid data"}
+        abort(make_response(response, 400))
+
+    query = db.select(Task).where(Task.id == task_id)
+    task = db.session.scalar(query)
+
+    if not task:
+        response = {"details": f"Task {task_id} not found"}
+        abort(make_response(response, 404))
+
+    return task
+
+# 
+
+
+    
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/584e9f08d2e1_.py b/migrations/versions/584e9f08d2e1_.py
new file mode 100644
index 000000000..a8cdc8b1f
--- /dev/null
+++ b/migrations/versions/584e9f08d2e1_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 584e9f08d2e1
+Revises: 
+Create Date: 2024-11-03 23:11:55.913934
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '584e9f08d2e1'
+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/9107b7cd3ea4_.py b/migrations/versions/9107b7cd3ea4_.py
new file mode 100644
index 000000000..c64cd1da0
--- /dev/null
+++ b/migrations/versions/9107b7cd3ea4_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 9107b7cd3ea4
+Revises: 9f0b21c68086
+Create Date: 2024-11-07 10:50:40.589452
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9107b7cd3ea4'
+down_revision = '9f0b21c68086'
+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/979027730a6c_.py b/migrations/versions/979027730a6c_.py
new file mode 100644
index 000000000..572c9404a
--- /dev/null
+++ b/migrations/versions/979027730a6c_.py
@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 979027730a6c
+Revises: 
+Create Date: 2024-11-10 16:07:25.244457
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '979027730a6c'
+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.Column('title', sa.String(), 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('goal_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ),
+    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/9f0b21c68086_.py b/migrations/versions/9f0b21c68086_.py
new file mode 100644
index 000000000..685da3db5
--- /dev/null
+++ b/migrations/versions/9f0b21c68086_.py
@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 9f0b21c68086
+Revises: 584e9f08d2e1
+Create Date: 2024-11-04 19:05:02.373852
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9f0b21c68086'
+down_revision = '584e9f08d2e1'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    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')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ac812160f398_.py b/migrations/versions/ac812160f398_.py
new file mode 100644
index 000000000..66d5965fb
--- /dev/null
+++ b/migrations/versions/ac812160f398_.py
@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: ac812160f398
+Revises: 9107b7cd3ea4
+Create Date: 2024-11-07 23:46:58.933200
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ac812160f398'
+down_revision = '9107b7cd3ea4'
+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/requirements.txt b/requirements.txt
index af8fc4cf4..e6f8d5f26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,10 +3,15 @@ blinker==1.7.0
 certifi==2024.8.30
 charset-normalizer==3.3.2
 click==8.1.7
+colorama==0.4.6
+filelock==3.16.1
 Flask==3.0.2
+Flask-Cors==5.0.0
 Flask-Migrate==4.0.5
 Flask-SQLAlchemy==3.1.1
-greenlet==3.0.3
+future==1.0.0
+gevent==24.11.1
+greenlet==3.1.1
 gunicorn==21.2.0
 idna==3.10
 iniconfig==2.0.0
@@ -17,10 +22,17 @@ MarkupSafe==2.1.5
 packaging==23.2
 pluggy==1.4.0
 psycopg2-binary==2.9.9
+PySocks==1.7.1
 pytest==8.0.0
 python-dotenv==1.0.1
 requests==2.32.3
+requests-file==2.1.0
+setuptools==75.8.0
+slack_sdk==3.33.3
 SQLAlchemy==2.0.25
+tldextract==5.1.3
 typing_extensions==4.9.0
 urllib3==2.2.3
 Werkzeug==3.0.1
+zope.event==5.0
+zope.interface==7.2
diff --git a/tests/conftest.py b/tests/conftest.py
index e370e597b..a2061c874 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,7 +43,7 @@ def client(app):
 @pytest.fixture
 def one_task(app):
     new_task = Task(title="Go on my daily walk 🏞", 
-                    description="Notice something new every day", 
+                    description="Notice something new every day",
                     completed_at=None)
     db.session.add(new_task)
     db.session.commit()
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..2e89dff44 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -51,7 +51,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -60,13 +60,16 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert "details" in response_body
+    assert response_body["details"] == "Task 1 not found"
+
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +96,7 @@ def test_create_task(client):
     assert new_task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task(client, one_task):
     # Act
     response = client.put("/tasks/1", json={
@@ -119,7 +122,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -131,13 +134,15 @@ def test_update_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert "details" in response_body
+    assert response_body == {"details": "Task 1 not found"}
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +157,7 @@ def test_delete_task(client, one_task):
     assert Task.query.get(1) == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task_not_found(client):
     # Act
     response = client.delete("/tasks/1")
@@ -161,15 +166,17 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert "details" in 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 +193,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..b1c194aca 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -5,7 +5,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
     """
@@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_complete_task(client, completed_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
     """
@@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task):
     assert Task.query.get(1).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_incomplete_task(client, one_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -128,13 +128,14 @@ def test_mark_complete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert response_body == {"details": f"Task 1 not found"}
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -143,7 +144,8 @@ def test_mark_incomplete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert response_body == {"details": f"Task 1 not found"}
     # *****************************************************************
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..6f1033c64 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
+from app.models.goal import Goal
 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 +13,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -46,22 +47,26 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
-    pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert "details" in response_body
+    assert response_body == {"details":
+        "Goal 1 not found"
+    }
     # ---- Complete Test ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,34 +85,52 @@ def test_create_goal(client):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated Goal Title"
+    })
+    response_body = response.get_json()
 
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 200
+    assert "goal" in response_body
     # assertion 2 goes here
+    goal = Goal.query.get(1)
+    assert response_body == {"goal": {
+        "id": 1,
+        "title": "Updated Goal Title"
+    } }
     # assertion 3 goes here
+    assert goal.id == 1
+    assert goal.title == "Updated Goal Title"
     # ---- Complete Assertions Here ----
+    
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
-
+    response = client.put("/goals/1")
+    response_body = response.get_json()
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert response_body == {"details": f"Goal 1 not found"}
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -115,36 +138,41 @@ def test_delete_goal(client, one_goal):
 
     # Assert
     assert response.status_code == 200
-    assert "details" in response_body
-    assert response_body == {
-        "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted'
-    }
+    
 
     # 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")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    assert "details" in response_body
+    assert response_body == {
+        "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted'
+    }
+    assert Goal.query.get(1) == None
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
+    # raise Exception("Complete test")
 
     # Act
     # ---- Complete Act Here ----
+    response = client.delete("goals/1")
+    response_body = response.get_json()
 
     # Assert
+    response.status_code == 404
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert "details" in response_body
     # assertion 2 goes here
+    assert response_body == {"details": "Goal 1 not found"}
     # ---- Complete Assertions Here ----
+    
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
@@ -152,6 +180,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"
     }
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..a24b2acc1 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert len(Goal.query.get(1).tasks) == 3
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on
     assert len(Goal.query.get(1).tasks) == 2
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_goal(client):
     # Act
     response = client.get("/goals/1/tasks")
@@ -50,14 +50,14 @@ def test_get_tasks_for_specific_goal_no_goal(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
+    
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -99,7 +99,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()