diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..1043b186b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,31 +4,43 @@
 import os
 from dotenv import load_dotenv
 
+token = os.environ.get('SLACK_TOKEN')
 
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
 
-
+# client = slack.WebClient(token=os.environ['SLACK_TOKEN'])
 def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
     if test_config is None:
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_DATABASE_URI")
+            "RENDER_DATABASE_URI")
+        # app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
+        #     "SQLALCHEMY_DATABASE_URI")
     else:
         app.config["TESTING"] = True
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_TEST_DATABASE_URI")
+    
+    db.init_app(app)
+    migrate.init_app(app, db)
+
+    
 
     # Import models here for Alembic setup
     from app.models.task import Task
     from app.models.goal import Goal
 
-    db.init_app(app)
-    migrate.init_app(app, db)
-
+    
+    from app.routes.task_routes import tasks_bp
+    from app.routes.goal_routes import goals_bp
     # Register Blueprints here
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
 
+    # client = slack.WebClient(token=os.environ['SLACK_TOKEN'])
     return app
+
diff --git a/app/helper.py b/app/helper.py
new file mode 100644
index 000000000..4fe28de03
--- /dev/null
+++ b/app/helper.py
@@ -0,0 +1,57 @@
+from app.models.task import Task
+from flask import jsonify, abort, make_response
+from app import token
+import requests
+
+def filter_by_params(cls, query_params):
+    sort_by = query_params.get("sort")
+    
+    if sort_by:
+        return get_sorted_items_by_params(cls, query_params)
+    
+    if query_params:
+        query_params = {k.lower(): v.title() for k, v in query_params.items()}
+        items = cls.query.filter_by(**query_params).all()
+    else:
+        items = cls.query.all()
+    
+    return items
+
+
+def get_sorted_items_by_params(cls, query_params):
+    sort_param = query_params.pop('sort', None)
+
+    if sort_param == 'asc':
+        return cls.query.filter_by(**query_params).order_by(cls.title.asc()).all()
+    elif sort_param == 'desc':
+        return cls.query.filter_by(**query_params).order_by(cls.title.desc()).all()
+    else:
+        return cls.query.filter_by(**query_params).order_by(cls.id.asc()).all()
+
+    
+def validate_model(cls, id):
+    try:
+        id = int(id)
+    except:
+        message = f"{cls.__name__} {id} is invalid"
+        abort(make_response({"message": message}, 400))
+
+    obj = cls.query.get(id)
+    if not obj:
+        abort(make_response(jsonify(message=f"{cls.__name__} not found"), 404))
+    
+    return obj
+
+def slack_post_message(task):
+    api_url = 'http://slack.com/api/chat.postMessage'
+
+    payload = {
+        "channel": "task-notifications",
+        "text":f"Someone just completed the task {task.title}"
+    }
+    headers = {
+        "Authorization": f"Bearer {token}"
+    }
+    response = requests.post(api_url, headers=headers, data=payload)
+
+    print(response.text)
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..d475a2040 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,3 +3,35 @@
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", back_populates="goal", lazy=True)
+
+    def goal_to_dict(self):
+            return {
+            "id": self.goal_id,
+            "title": self.title
+            }
+    @classmethod
+    def create_new_goal(cls, request_data):
+        if "title" not in request_data:
+            raise KeyError
+       
+        return cls(
+            title=request_data["title"].title()
+        )
+    
+    def __str__(self):
+        return {
+            self.__class__.__name__.lower(): {
+                "id": self.goal_id,
+                "title": self.title
+            }
+        }
+    
+    def update(self, goal):
+        for key, value in goal.items():
+            if key == "title":
+                self.title = value
+        
+        return self.goal_to_dict()
+
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..9b3cf001e 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,3 +3,54 @@
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String(length=255))
+    description=db.Column(db.String)
+    completed_at=db.Column(db.DateTime, nullable=True)
+    is_complete= db.Column(db.Boolean, default=False)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def task_to_dict(self):
+        return {
+        "id": self.task_id,
+        "title": self.title,
+        "description": self.description,
+        "is_complete": False if self.completed_at is None else True
+        if self.completed_at is not None else None
+        }
+    
+    @classmethod
+    def create_new_task(cls, request_data):
+        if "title" not in request_data:
+            raise KeyError({"details": "Invalid data"})
+        if "description" not in request_data:
+            raise KeyError("description")
+        
+        request_data["completed_at"] = None
+        is_complete = False if request_data["completed_at"] is None else True
+        
+        return cls(
+            title=request_data["title"].title(),
+            description=request_data["description"],
+            completed_at=request_data.get("completed_at"),
+            is_complete=is_complete
+        )
+      
+    def update(self, task):
+        for key, value in task.items():
+            if key == "title":
+                self.title = value
+            if key == "description":
+                self.description = value
+        
+        return self.task_to_dict()
+    
+    def __str__(self):
+        return {
+            self.__class__.__name__.lower(): {
+                "id": self.task_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": self.is_complete
+            }
+        }
diff --git a/app/routes.py b/app/routes.py
deleted file mode 100644
index 3aae38d49..000000000
--- a/app/routes.py
+++ /dev/null
@@ -1 +0,0 @@
-from flask import Blueprint
\ No newline at end of file
diff --git a/app/routes/__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
new file mode 100644
index 000000000..4f3ff99d9
--- /dev/null
+++ b/app/routes/goal_routes.py
@@ -0,0 +1,95 @@
+from flask import Blueprint, jsonify, make_response, request
+from app import db
+from app.helper import validate_model
+from app.models.goal import Goal
+from app.models.task import Task
+
+
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@goals_bp.route("", methods = ["POST"])
+def create_goals():
+    request_body = request.get_json()
+    try:
+        new_goal = Goal.create_new_goal(request_body)
+        db.session.add(new_goal)
+        db.session.commit()
+
+        message = new_goal.__str__()
+
+        return make_response(jsonify(message), 201)
+    except KeyError as e:
+        message = "Invalid data"
+        return make_response({"details": message}, 400)
+
+@goals_bp.route("", methods = ["GET"])
+def read_all_goals():
+    goals = Goal.query.all()
+    goal_response = [goal.goal_to_dict() for goal in goals]
+    return jsonify(goal_response)
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def read_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    message = goal.__str__()
+
+    return make_response(jsonify(message), 200)
+
+@goals_bp.route("/<goal_id>", methods=["PUT"])
+def update_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    goal.update(request_body)
+
+    db.session.commit()
+    message = goal.__str__()
+    return make_response(jsonify(message))
+
+@goals_bp.route("/<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+
+    message = {
+        "details": f'Goal {goal_id} "{goal.title}" successfully deleted'
+        }
+    return make_response(jsonify(message), 200)
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def assign_tasks_to_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    if not request_body:
+        return jsonify({'error': 'Invalid request body'}), 400
+
+    task_ids = request_body.get('task_ids', [])
+    for task_id in task_ids:
+        task = validate_model(Task, task_id)
+        task.goal_id = goal.goal_id
+        db.session.commit()
+
+    return jsonify({'id': goal.goal_id, 'task_ids': task_ids}), 200
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_task_of_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    goal = Goal.query.get(goal_id)
+    task_data = []
+    for task in goal.tasks:
+        task_data.append({
+            "id": task.task_id,
+            "goal_id": goal.goal_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": task.is_complete
+        })
+        task_data
+    response = {
+        "id": goal.goal_id,
+        "title": goal.title,
+        "tasks": task_data
+    }
+    return jsonify(response), 200
+
+
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
new file mode 100644
index 000000000..bf3452fa1
--- /dev/null
+++ b/app/routes/task_routes.py
@@ -0,0 +1,77 @@
+from flask import Blueprint, jsonify, abort, make_response, request
+from app import db
+from app.models.task import Task
+from app.helper import filter_by_params, validate_model, slack_post_message
+from datetime import datetime
+
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+@tasks_bp.route("", methods = ["POST"])
+def create_tasks():
+    request_body = request.get_json()
+    try:
+        new_task = Task.create_new_task(request_body)
+        db.session.add(new_task)
+        db.session.commit()
+
+        message = new_task.__str__()
+
+        return make_response(jsonify(message), 201)
+    except KeyError as e:
+        message = "Invalid data"
+        return make_response({"details": message}, 400)
+
+@tasks_bp.route("", methods = ["GET"])
+def read_all_tasks():
+    query_params = request.args.to_dict()
+    tasks = filter_by_params(Task, query_params)
+    tasks_response = [task.task_to_dict() for task in tasks]
+    return jsonify(tasks_response)
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def read_one_task(task_id):
+    task = validate_model(Task, task_id)
+    task = Task.query.get(task_id)
+    task = task.__str__()
+    return jsonify(task), 200
+
+@tasks_bp.route("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+    task = validate_model(Task, task_id)
+    request_body = request.get_json()
+    task.update(request_body)
+
+    db.session.commit()
+    message = task.__str__()
+    return make_response(jsonify(message))
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = validate_model(Task, task_id)
+    db.session.delete(task)
+    db.session.commit()
+
+    message = {
+        "details": f'Task {task_id} "{task.title}" successfully deleted'
+        }
+    return make_response(jsonify(message), 200)
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def mark_task_complete(task_id):
+    task = validate_model(Task, task_id)
+    task.is_complete = True
+    task.completed_at = datetime.now().isoformat()
+    db.session.commit()
+
+    slack_post_message(task)
+    message = task.__str__()
+    return make_response(jsonify(message), 200)
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_task_incomplete(task_id):
+    task = validate_model(Task, task_id)
+    task.is_complete = False
+    task.completed_at = None
+    db.session.commit()
+    message = task.__str__()
+    return make_response(jsonify(message), 200)
diff --git a/app/say_bot.py b/app/say_bot.py
new file mode 100644
index 000000000..870725cf9
--- /dev/null
+++ b/app/say_bot.py
@@ -0,0 +1,8 @@
+# import os
+# from pathlib import Path
+# from dotenv import load_dotenv
+
+# env_path = Path('.') / '.env'
+# load_dotenv(dotenv_path=env_path)
+
+# token = os.environ.get('SLACK_TOKEN')
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..98e4f9c44
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..f8ed4801f
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 000000000..8b3fb3353
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,96 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 000000000..2c0156303
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/migrations/versions/1f58e4a53c1b_modifed_task_model.py b/migrations/versions/1f58e4a53c1b_modifed_task_model.py
new file mode 100644
index 000000000..58b4879a6
--- /dev/null
+++ b/migrations/versions/1f58e4a53c1b_modifed_task_model.py
@@ -0,0 +1,34 @@
+"""modifed task model
+
+Revision ID: 1f58e4a53c1b
+Revises: 63fd0e87bb52
+Create Date: 2023-05-10 10:23:43.645763
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1f58e4a53c1b'
+down_revision = '63fd0e87bb52'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('description', sa.String(), nullable=True))
+    op.add_column('task', sa.Column('title', sa.String(), nullable=True))
+    op.drop_column('task', 'task_description')
+    op.drop_column('task', 'task_title')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('task_title', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.add_column('task', sa.Column('task_description', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'title')
+    op.drop_column('task', 'description')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/2260413c2b8e_change_task_title_to_title_in_task_model.py b/migrations/versions/2260413c2b8e_change_task_title_to_title_in_task_model.py
new file mode 100644
index 000000000..2582699bd
--- /dev/null
+++ b/migrations/versions/2260413c2b8e_change_task_title_to_title_in_task_model.py
@@ -0,0 +1,30 @@
+"""change task_title to title in Task model
+
+Revision ID: 2260413c2b8e
+Revises: 535d6df62a78
+Create Date: 2023-05-11 11:56:32.709902
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '2260413c2b8e'
+down_revision = '535d6df62a78'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('title', sa.String(), nullable=True))
+    op.drop_column('task', 'task_title')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('task_title', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/535d6df62a78_edits_task_model_to_include_is_complete.py b/migrations/versions/535d6df62a78_edits_task_model_to_include_is_complete.py
new file mode 100644
index 000000000..d3209ccdd
--- /dev/null
+++ b/migrations/versions/535d6df62a78_edits_task_model_to_include_is_complete.py
@@ -0,0 +1,28 @@
+"""Edits Task model to include is_complete
+
+Revision ID: 535d6df62a78
+Revises: a37985866f46
+Create Date: 2023-05-10 11:09:05.271721
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '535d6df62a78'
+down_revision = 'a37985866f46'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/63fd0e87bb52_adds_task_model.py b/migrations/versions/63fd0e87bb52_adds_task_model.py
new file mode 100644
index 000000000..d90b027bf
--- /dev/null
+++ b/migrations/versions/63fd0e87bb52_adds_task_model.py
@@ -0,0 +1,39 @@
+"""adds task model
+
+Revision ID: 63fd0e87bb52
+Revises: 
+Create Date: 2023-05-09 21:33:36.889457
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '63fd0e87bb52'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('goal_id', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('task',
+    sa.Column('task_id', sa.Integer(), nullable=False),
+    sa.Column('task_title', sa.String(), nullable=True),
+    sa.Column('task_description', sa.String(), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/8208e8186ede_modified_task_table_string_length_is_255.py b/migrations/versions/8208e8186ede_modified_task_table_string_length_is_255.py
new file mode 100644
index 000000000..915835009
--- /dev/null
+++ b/migrations/versions/8208e8186ede_modified_task_table_string_length_is_255.py
@@ -0,0 +1,30 @@
+"""modified task table string length is 255
+
+Revision ID: 8208e8186ede
+Revises: 2260413c2b8e
+Create Date: 2023-05-14 11:46:43.700793
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8208e8186ede'
+down_revision = '2260413c2b8e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'task', type_='foreignkey')
+    op.drop_column('task', 'goal_id')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/a37985866f46_added_read_one_task_route.py b/migrations/versions/a37985866f46_added_read_one_task_route.py
new file mode 100644
index 000000000..9e904eeb9
--- /dev/null
+++ b/migrations/versions/a37985866f46_added_read_one_task_route.py
@@ -0,0 +1,30 @@
+"""added read_one_task route
+
+Revision ID: a37985866f46
+Revises: 1f58e4a53c1b
+Create Date: 2023-05-10 10:48:24.013890
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a37985866f46'
+down_revision = '1f58e4a53c1b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('task_title', sa.String(), nullable=True))
+    op.drop_column('task', 'title')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'task_title')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..1c2367ed4 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")
@@ -31,8 +31,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")
@@ -50,8 +49,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 +57,9 @@ def test_get_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Task 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 +86,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 +112,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -130,14 +123,10 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Task 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 +141,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 +149,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 == {"message": "Task 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 +170,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..8a4df23e4 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -5,7 +5,8 @@
 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
     """
@@ -41,8 +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")
@@ -61,8 +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
     """
@@ -98,8 +97,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")
@@ -118,8 +116,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 +124,9 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Task 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 +134,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 not found"}
\ No newline at end of file
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..c4b39be88 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
 import pytest
+from app.models.goal import Goal
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -11,8 +12,7 @@ def test_get_goals_no_saved_goals(client):
     assert response.status_code == 200
     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")
@@ -28,8 +28,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")
@@ -45,23 +44,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 == {
+            "message": "Goal 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={
@@ -79,35 +73,39 @@ def test_create_goal(client):
         }
     }
 
-
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
-    # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated Goal Title"
+    })
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
-
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body == {
+        "goal": {
+            "id": 1,
+            "title": "Updated Goal Title"
+        }
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "Updated Goal Title"
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated Goal Title",
+        "description": "Updated Goal Description",
+    })
+    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 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")
@@ -123,28 +121,24 @@ def test_delete_goal(client, one_goal):
     # Check that the goal was deleted
     response = client.get("/goals/1")
     assert response.status_code == 404
+    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
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
-
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
 
     # Act
-    # ---- Complete Act Here ----
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
-
+    assert response.status_code == 404
+    assert response_body == {"message": "Goal not found"}
+    assert Goal.query.all() == []
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..0a6d4d738 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,10 @@ def test_get_tasks_for_specific_goal_no_goal(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "Goal not found"}
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +70,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,20 +95,24 @@ 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 = client.get("goals/1/tasks")
     response_body = response.get_json()
 
     assert response.status_code == 200
-    assert "task" in response_body
-    assert "goal_id" in response_body["task"]
+    assert "tasks" in response_body
+    assert "goal_id" in response_body["tasks"][0]
     assert response_body == {
-        "task": {
-            "id": 1,
-            "goal_id": 1,
-            "title": "Go on my daily walk 🏞",
-            "description": "Notice something new every day",
-            "is_complete": False
-        }
-    }
+        "id": 1,
+        "title": "Build a habit of going outside daily",
+        "tasks": [
+            {
+                "id": 1,
+                "goal_id": 1,
+                "title": "Go on my daily walk 🏞",
+                "description": "Notice something new every day",
+                "is_complete": False
+            }
+        ]
+    }
\ No newline at end of file