diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..62e430aca
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'
\ No newline at end of file
diff --git a/ada-project-docs/wave_04.md b/ada-project-docs/wave_04.md
index 079ce6485..6268f5aa3 100644
--- a/ada-project-docs/wave_04.md
+++ b/ada-project-docs/wave_04.md
@@ -98,9 +98,13 @@ Visit https://api.slack.com/methods/chat.postMessage to read about the Slack API
 Answer the following questions. These questions will help you become familiar with the API, and make working with it easier.
 
 - What is the responsibility of this endpoint?
+## post to slack chat
 - What is the URL and HTTP method for this endpoint?
+## POST https://slack.com/api/chat.postMessage
 - What are the _two_ _required_ arguments for this endpoint?
+## api token and channel and at least onen: attachment, block, or text
 - How does this endpoint relate to the Slackbot API key (token) we just created?
+## slackbot api key is required to authorize the post request 
 
 Now, visit https://api.slack.com/methods/chat.postMessage/test.
 
diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..241ba0952 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -29,6 +29,10 @@ def create_app(test_config=None):
     db.init_app(app)
     migrate.init_app(app, db)
 
+    from .routes import tasks_bp
+    from .goal_routes import goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
     # Register Blueprints here
 
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
new file mode 100644
index 000000000..c94c19af0
--- /dev/null
+++ b/app/goal_routes.py
@@ -0,0 +1,133 @@
+# import json
+# import os
+# import datetime
+# from pandas import json_normalize
+# import requests
+# from urllib import response
+from flask import Blueprint, jsonify, abort, make_response, request
+from sqlalchemy import desc
+from app import db
+from app.models.goal import Goal
+from app.models.task import Task
+from app.routes import get_task, get_task_by_id, update_task_by_id
+from .helper_routes import get_record_by_id
+
+
+goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+##CRUD
+##CREATE : POST
+@goals_bp.route("", methods=["POST"])
+def manage_post_goals():
+    request_body = request.get_json()
+    title = request_body.get("title")
+
+    if title is None:
+        response_body = make_response(jsonify({"details": "Invalid data"}), 400)
+        return response_body
+    
+
+    goals = Goal.from_dict(request_body)
+
+
+    db.session.add(goals)
+    db.session.commit()
+
+    return jsonify({"goal":goals.to_dictionary()}), 201
+
+#READ : GET
+@goals_bp.route("", methods=["GET"])
+def manage_get_goals():
+    goals = Goal.query.all()
+    goal_dictionary = [goal.to_dictionary() for goal in goals]
+
+    return jsonify(goal_dictionary)
+
+
+
+@goals_bp.route("/<id>", methods=["GET"])
+def get_goal_by_id(id):
+    goal = get_goal(id)
+    # response_body = dict()
+    # response_body = goal.to_dictionary()
+    return jsonify({"goal":goal.to_dictionary()})
+
+
+#UPDATE : PUT
+@goals_bp.route("/<id>", methods=["PUT"])
+def update_goal_by_id(id):
+    goal = get_goal(id)
+
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return get_goal_by_id(id)
+
+
+#DELETE : DELETE
+@goals_bp.route("/<id>", methods=["DELETE"])
+def delete_goal_by_id(id):
+    goal = get_goal(id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return make_response(jsonify({"details": f"Goal {goal.id} \"{goal.title}\" successfully deleted"}), 200)
+
+
+
+#### FRIENDSHIP ROUTEs
+@goals_bp.route("/<id>/tasks", methods=["POST"])
+def post_tasks_for_goal(id):
+    goal = get_goal(id)
+    request_body = request.get_json()
+
+    # print("~~~RQ_BOD", request_body)
+    task_ids = request_body["task_ids"]
+    # print(task_ids)
+
+    for task_id in task_ids:
+        task = get_task(task_id)
+        task.goal = goal
+        update_task_by_id(task_id) 
+
+    db.session.commit()
+    
+    return {"id": goal.id, "task_ids": task_ids}
+
+
+@goals_bp.route("/<id>/tasks", methods=["GET"])
+def get_tasks_for_goal(id):
+    goal = get_record_by_id(Goal, id)
+    tasks = Task.query.filter_by(id=goal.id)
+    # print("*******TASKS******",tasks)
+    tasks_info = [task.to_dictionary_with_goal() for task in tasks]
+    response_body = {
+        "id" : goal.id,
+        "title" : goal.title,
+        "tasks" : tasks_info
+    }
+
+    return jsonify(response_body)
+
+## no request body ?
+## response body returns {goal{tasks}}
+
+
+
+## HELPER FUNCTIONS:
+def get_goal(id):
+    try:
+        goal_id = int(id)
+    except ValueError:
+        abort(make_response(jsonify({"message": f"goal {id} invalid"}), 400))
+    
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        abort(make_response(jsonify({"message": f"goal {id} not found"}), 404))
+    else: 
+        return goal
diff --git a/app/helper_routes.py b/app/helper_routes.py
new file mode 100644
index 000000000..1ec1a5ccb
--- /dev/null
+++ b/app/helper_routes.py
@@ -0,0 +1,14 @@
+from flask import jsonify, abort, make_response
+
+def get_record_by_id(cls, id):
+    try:
+        id = int(id)
+    except ValueError:
+        abort(make_response(jsonify({"message": f"Invalid id: {id} "}), 400))
+    
+    model = cls.query.get(id)
+
+    if not model:
+        abort(make_response(jsonify({"message": f"task {id} not found"}), 404))
+    else: 
+        return model
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..357e19524 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,4 +2,25 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String, nullable=False)
+    tasks = db.relationship("Task", back_populates="goal")
+
+    def to_dictionary(self):
+        # if self.completed_at:
+        #     completed = True
+        # else:
+        #     completed = False
+        response = {
+            "id" : self.id,
+            "title" : self.title
+        #     "tasks" : self.tasks if self.tasks else None
+        }
+        if self.tasks:
+            response["tasks"] = self.tasks
+
+        return response
+
+    @classmethod
+    def from_dict(cls, data_dict):
+        return Goal(title=data_dict["title"])
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..c256fc008 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,51 @@
+# from urllib import response
+# from pandas import describe_option
+# from sqlalchemy import true
 from app import db
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    completed_at = db.Column(db.DateTime, default=None)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'))
+    goal = db.relationship("Goal", back_populates="tasks")
+
+    def to_dictionary(self):
+        # if self.completed_at:
+        #     completed = True
+        # else:
+        #     completed = False
+        response = {
+            "id" : self.id,
+            "title" : self.title,
+            "description" : self.description,
+            "is_complete" : True if self.completed_at else False
+        }
+        return response
+    
+    def to_dictionary_with_goal(self):
+        if self.goal_id is None:
+            response = {
+                "id" : self.id,
+                "title" : self.title,
+                "description" : self.description,
+                "is_complete" : True if self.completed_at else False
+            }
+        else:
+            response = {
+            "id" : self.id,
+            "title" : self.title,
+            "goal_id" : self.goal_id,
+            "description" : self.description,
+            "is_complete" : True if self.completed_at else False
+        }
+        return response
+    # @classmethod
+    # def from_dict(cls, data_dict):
+    #     return cls(
+    #     title=data_dict["title"],
+    #     description=data_dict["description"],
+    #     completed_at=data_dict["completed_at"]
+    #     )
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 3aae38d49..6ac9c375d 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1 +1,151 @@
-from flask import Blueprint
\ No newline at end of file
+import json
+import os
+import datetime
+import requests
+from urllib import response
+from flask import Blueprint, jsonify, abort, make_response, request
+from sqlalchemy import desc
+from app import db
+from app.models.task import Task
+
+
+
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+api_key = os.environ.get("BOT_API_KEY")
+
+
+
+@tasks_bp.route("", methods = ["POST"])
+def manage_post_tasks():
+    request_body = request.get_json()
+    title = request_body.get("title")
+    description = request_body.get("description")
+    completed_at = request_body.get("completed_at", None)
+    # print(title)
+    # print(description)
+    # print(request_body)
+    if title is None or description is None:
+        response_body = make_response(jsonify({"details": "Invalid data"}), 400)
+        # print("inside if statement")
+        # print(response_body)
+        return response_body
+    
+
+    new_task = Task(
+        title = title,
+        description = description,
+        completed_at = completed_at
+        )
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    response_body = dict()
+    response_body["task"] = new_task.to_dictionary()
+
+    return make_response(jsonify(response_body), 201)
+
+
+@tasks_bp.route("", methods=["GET"])
+def manage_get_tasks():
+    sort_param = request.args.get("sort")
+
+    if sort_param == "asc":
+        tasks = Task.query.order_by(Task.title).all()
+    elif sort_param == "desc":
+        tasks = Task.query.order_by(desc(Task.title)).all()
+    else:
+        tasks = Task.query.all()
+
+    tasks_response = [task.to_dictionary() for task in tasks]
+    # print(tasks_response)
+
+    return jsonify(tasks_response)
+
+# def sort_task_by_title(title):
+#     pass
+
+
+@tasks_bp.route("/<id>", methods=["GET"])
+def get_task_by_id(id):
+    task = get_task(id)
+    response_body = dict()
+    response_body["task"] = task.to_dictionary_with_goal()
+
+    return jsonify(response_body)
+
+
+@tasks_bp.route("/<id>", methods=["PUT"])
+def update_task_by_id(id):
+    task = get_task(id)
+
+    request_body = request.get_json()
+    task_keys = request_body.keys()
+
+    if "title" in task_keys:
+        task.title = request_body["title"]
+    if "description" in task_keys:
+        task.description = request_body["description"]
+
+    db.session.commit()
+
+    return get_task_by_id(id)
+
+
+@tasks_bp.route("/<id>", methods=["DELETE"])
+def delete_task_by_id(id):
+    task = get_task(id)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    return make_response(jsonify({"details": f"Task {task.id} \"{task.title}\" successfully deleted"}), 200)
+
+
+@tasks_bp.route("/<id>/mark_complete", methods=["PATCH"])
+def update_task_mark_complete_by_id(id):
+    task = get_task(id)
+    text = f"Someone just completed the task {task.title}"
+    channel_id = "C03ENLYJ7AT"
+
+    path = f"https://slack.com/api/chat.postMessage?channel={channel_id}&text={text}"
+    
+    headers = {"Authorization": api_key}
+
+    task.completed_at = datetime.date.today()
+    
+    db.session.commit()
+
+    response_body = {"task":task.to_dictionary()}
+    response = requests.post(path, headers=headers)
+
+    return response_body
+
+
+@tasks_bp.route("/<id>/mark_incomplete", methods=["PATCH"])
+def update_task_mark_incomplete_by_id(id):
+    task = get_task(id)
+
+    task.completed_at = None
+    
+    db.session.commit()
+
+    response_body = {"task":task.to_dictionary()}
+
+    return response_body
+
+
+
+def get_task(id):
+    try:
+        task_id = int(id)
+    except ValueError:
+        abort(make_response(jsonify({"message": f"task {id} invalid"}), 400))
+    
+    task = Task.query.get(task_id)
+
+    if not task:
+        abort(make_response(jsonify({"message": f"task {id} not found"}), 404))
+    else: 
+        return task
\ No newline at end of file
diff --git a/app/scratch.py b/app/scratch.py
new file mode 100644
index 000000000..0da401762
--- /dev/null
+++ b/app/scratch.py
@@ -0,0 +1,127 @@
+#####GRAVEYARD######
+####################
+######WAVE_1########
+######routes########
+## from task GET route
+    # title_query = request.args.get("title")
+    # is_complete = request.args.get("completed_at")
+
+    # if title_query:
+    #     tasks = Task.query.filer_by(title=title_query)
+    # else:
+    #     tasks = Task.query.filter_by(title=title_query)
+
+    # if Task.completed_at == None:
+    # change the key of completed_at to "is complete"
+    # change value None == False
+    # for task in tasks:
+    #     if Task.completed_at == None:
+    #         task["completed_at"] == task["is_complete"]
+    #         task["is_complete"] == False
+    #     else:
+    #         Task.completed_at == is_complete
+    #         task["completed_at"] == task["is_complete"]
+
+######WAVE_2########
+######routes########
+## in get ##
+    # print(sort_param)
+    # asc or desc
+
+    # order ascending:
+    # need request to have asc
+    # tasks_asc = Task.query.order_by(Task.title).all()
+    # order descending:
+    # need req to have desc
+    # tasks_desc = Task.query.order_by(desc(Task.title)).all()
+
+
+    ### this might query titles and need a change in task_response
+    #   title_query = request.args.get("title")
+    ### this might be an alternative
+    # tasks = Task.query.all()
+    
+    # if title_query:
+    #     tasks = Task.query.order_by(Task.title).all()
+    # else:
+    #     tasks = Task.query.all()
+
+######WAVE_3########
+######routes########
+
+# "completed"
+# create a patch route to tasks/<task_id>/mark_complete
+# request body has an id and a completed_at 'null' value
+# resposnse body is dictionary with task: as key and tasks as values
+# > nested dictionary is_complete key == true
+
+# PATCH on tasks/<task_id>/mark_complete
+# "complete" on "completed task"
+# request is ID and completed_at with a datetime value
+# response is dictionary with key task and value tasks
+# > nested dictionary is_complete == true
+
+
+# if it is " not completed"
+# > patch route to tasks/<task_id>/mark_incomplete 
+# ** noticce how there are two routes, make two routes
+# request body has an id and a "completed_at" attribute with datetime
+# update makes response body:
+# dictionary with task as key and tasks as values
+# >nested dictionary is_complete == false
+# completed_at (which is in the methods) is null/None
+
+# patch on tasks/<task_id>/mark_incomplete
+
+
+#wave 4
+## slack message sent to task-notifications with
+## "Someone just completed the task My Beautiful Task"
+## need to use api key !!
+# api_key (?) made in .env
+# > no request body
+# params : channel and text
+# authorization : api_key
+# patch -> sends to channel 'task-notifications'
+# {"type": "text",
+# "text": "Hello World!"}
+
+
+#####WAVE_6#########
+## POST
+    # {goal.tasks.append(task) for task in task_list if task not in goal.task}
+    # goal.tasks = request_body["tasks"]
+
+    # print("req bod:", request_body)
+
+    # new_task = Task(
+    #     title=request_body["title"],
+    #     description=request_body["description"],
+    #     completed_at=request_body["completed_at"]
+    #     )
+    # new_task.goal = goal
+    # print("new_task:", new_task)
+
+    # db.session.add(new_task)
+
+        # task_list.append(task.id)
+        # task.goal_id = goal.id
+    # {goal.tasks.append(task) for task in task_list if task not in goal.task}
+    # goal.tasks = request_body["tasks"]
+
+    # task_list = []
+    # return jsonify(dict("id: {goal.id}: task_ids: {task_ids}")),200
+## GET
+
+    # for task_id in goal.tasks:
+    #     task = get_task(task_id)
+    #     # task_list.append(task.id)
+    #     task.goal = goal
+    #     # task.goal_id = goal.id
+
+    # response_body = dict()
+    # response_body["tasks"] = goal.to_dictionary()
+    # request_body = request.get_json()
+####################
+####################
+########END#########
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/18957d7eb2f9_.py b/migrations/versions/18957d7eb2f9_.py
new file mode 100644
index 000000000..107db5cd4
--- /dev/null
+++ b/migrations/versions/18957d7eb2f9_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 18957d7eb2f9
+Revises: f523f252ac5d
+Create Date: 2022-05-12 14:00:36.626394
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '18957d7eb2f9'
+down_revision = 'f523f252ac5d'
+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'], ['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/f523f252ac5d_.py b/migrations/versions/f523f252ac5d_.py
new file mode 100644
index 000000000..481d7b399
--- /dev/null
+++ b/migrations/versions/f523f252ac5d_.py
@@ -0,0 +1,40 @@
+"""empty message
+
+Revision ID: f523f252ac5d
+Revises: 
+Create Date: 2022-05-12 11:57:43.766265
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f523f252ac5d'
+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.Integer(), 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/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..36b33f5c5 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")
@@ -59,14 +59,10 @@ def test_get_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {'message': 'task 1 not found'}
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +89,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 +115,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 +126,15 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "task 1 not found"}
 
-    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_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +149,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,8 +157,8 @@ def test_delete_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"message": "task 1 not found"}
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -169,7 +166,7 @@ def test_delete_task_not_found(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_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +183,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 959176ceb..c358dd949 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")
@@ -127,14 +127,15 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "task 1 not found"}
 
-    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_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -142,8 +143,9 @@ def test_mark_incomplete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message": "task 1 not found"}
 
-    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***************
     # *****************************************************************
@@ -151,7 +153,7 @@ def test_mark_incomplete_missing_task(client):
 
 # Let's add this test for creating tasks, now that
 # the completion functionality has been implemented
-@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_with_valid_completed_at(client):
     # Act
     response = client.post("/tasks", json={
@@ -181,7 +183,7 @@ def test_create_task_with_valid_completed_at(client):
 
 # Let's add this test for updating tasks, now that
 # the completion functionality has been implemented
-@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_with_completed_at_date(client, completed_task):
     # Act
     response = client.put("/tasks/1", json={
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..865c336d4 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,7 @@
 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")
@@ -12,7 +12,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,7 +29,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -46,22 +46,24 @@ 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
+    assert response.status_code == 404
+    assert response_body == {'message': 'goal 1 not found'}
     # ---- Complete Test ----
     # assertion 1 goes here
     # assertion 2 goes here
     # ---- 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 +82,43 @@ 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
-    # 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")
+    # 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
-    # ---- 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")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -122,29 +133,35 @@ def test_delete_goal(client, one_goal):
 
     # Check that the goal was deleted
     response = client.get("/goals/1")
+    response_body = response.get_json()
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
+    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="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
+    response = client.get("/goals/1")
+    response_body = response.get_json()
     # ---- Complete Act Here ----
 
     # Assert
+    assert response.status_code == 404
+    assert response_body == {"message": "goal 1 not found"}
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
     # assertion 2 goes here
     # ---- 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={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..f6f1bd496 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")
+    assert response_body == {"message": "task 1 not found"}
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_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()