diff --git a/.Procfile.swo b/.Procfile.swo
new file mode 100644
index 000000000..d30f17dbe
Binary files /dev/null and b/.Procfile.swo differ
diff --git a/.Procfile.swp b/.Procfile.swp
new file mode 100644
index 000000000..faefa49ef
Binary files /dev/null and b/.Procfile.swp differ
diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..066ed31d9
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'
diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..8c7e98d66 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,12 +4,10 @@
 import os
 from dotenv import load_dotenv
 
-
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
 
-
 def create_app(test_config=None):
     app = Flask(__name__)
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
@@ -30,5 +28,12 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .routes import tasks_bp, goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
 
     return app
+
+
+
+    
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..607784756 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,7 @@
 from app import db
 
-
 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)
+    tasks = db.relationship("Task", back_populates="goal", lazy = True)
+
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..4aed01db8 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,9 @@
 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)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
diff --git a/app/routes.py b/app/routes.py
index 3aae38d49..70cac4dd0 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1 +1,354 @@
-from flask import Blueprint
\ No newline at end of file
+from app.models.task import *
+from app.models.goal import *
+from flask import Blueprint, jsonify, abort, make_response, request
+from datetime import date
+import requests
+import os
+from dotenv import load_dotenv
+load_dotenv()
+slack_token = os.environ.get("SLACK_TOKEN")
+
+# This is the BluePrint object that helps to "connect" my functions to
+# endpoints and HTTP methods for tasks.
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+#---------------post_task-----------
+# This function will be invoked when Flask receives an HTTP request with:
+#   method = POST
+#   endpoint = "/tasks"
+# This function creates a new Task instance with the information the client included
+# in the HTTP request. I get this information by using the global "request" variable.
+@tasks_bp.route("", methods=["POST"])
+def post_task():
+    # request.get_json() returns a dictionary with keys: "title", "description"
+    # Use corresponding values to create the Task instance.
+    post_dict = request.get_json()
+    print(post_dict)
+    if 'title' not in post_dict or 'description' not in post_dict:
+        return make_response({"details":"Invalid data"},400)
+    if 'completed_at' not in post_dict:
+        completed_at = None
+    else:
+        completed_at = post_dict['completed_at']
+    
+    title = post_dict['title']
+    description = post_dict['description']
+
+    task = Task(title=title, description=description, completed_at = completed_at)
+    db.session.add(task)
+    db.session.commit()
+
+    task_dict={}
+    if completed_at == None:
+        task_dict['is_complete'] = False
+    else:
+        task_dict['is_complete'] = True
+        
+
+    task_dict['id'] = task.id
+    task_dict['title'] = task.title
+    task_dict['description'] = task.description
+    return_dict = {"task": task_dict}
+    return jsonify(return_dict), 201
+
+# -------------get_all_tasks--------------
+# This function returns a list of dictionaries,
+# where each dictionary has keys: "id", "title", "description", "completed_data"
+# and values from a Task instance in the task_db.
+@tasks_bp.route("", methods=["GET"]) 
+def get_all_tasks():
+    
+    sort_query = request.args.get('sort')
+    if sort_query == 'asc':
+        task_db = Task.query.order_by(Task.title.asc()).all()
+    elif sort_query == 'desc':
+        task_db = Task.query.order_by(Task.title.desc()).all()
+    else:
+        task_db = Task.query.all()
+    
+    tasks_response = []
+    for task in task_db:
+        if task.completed_at == None:
+            is_complete = False
+        else:
+            is_complete = True
+        
+        task_dict = {'id': task.id,
+                    'title': task.title,
+                    'description': task.description,
+                    'is_complete': is_complete}
+        tasks_response.append(task_dict)
+    
+    return jsonify(tasks_response), 200    
+
+# -------get task by id--------------------    
+
+# This function finds the task with matching ID.
+# If a matching task is found, it return a dictionary with keys: "id", "title", "description", "completed_at"
+# and values from the matching Task instance.
+# If there is no matching task, then return an error message with return code 404
+@tasks_bp.route("/<id>",methods = ["GET"]) 
+def get_task_by_id(id):
+    # Remember that id from the request is a string and not an integer
+
+    task = Task.query.get(id)
+    if (task == None):
+        abort(make_response({"message":f"task {id} not found"}, 404))
+    
+    if task.completed_at == None:
+        is_complete = False
+    else:
+        is_complete = True
+    
+    task_dict={}
+    task_dict['id'] = task.id
+    task_dict['title'] = task.title
+    task_dict['description'] = task.description
+    task_dict['is_complete'] = is_complete
+    if not (task.goal_id == None):
+        task_dict['goal_id'] = task.goal_id
+    return_dict = {"task": task_dict}
+    return jsonify(return_dict), 200
+
+#------------remove task by id------------
+@tasks_bp.route("/<id>", methods=["DELETE"])
+def remove_task_by_id(id):
+    task = Task.query.get(id)
+    
+    if (task == None):
+        abort(make_response({"message":f"task {id} not found"}, 404))
+    
+    db.session.delete(task)
+    db.session.commit()
+    return make_response({"details":f"Task {id} \"{task.title}\" successfully deleted"},200)
+    
+
+#------------PUT Method - update task by id---------
+@tasks_bp.route("/<id>", methods=["PUT"])
+def update_task_by_id(id):
+    task = Task.query.get(id)
+
+    if (task == None):
+        abort(make_response({"message":f"task {id} not found"}, 404))
+
+    update_dict = request.get_json()
+    
+    if 'title' not in update_dict or 'description' not in update_dict:
+        return make_response({"details":"Invalid data"},400)
+    
+    if 'completed_at' not in update_dict:
+        completed_at = None
+    else:
+        completed_at = update_dict['completed_at']
+    
+    title = update_dict['title']
+    description = update_dict['description']
+
+    task.title = title
+    task.description = description
+    task.completed_at = completed_at
+    db.session.commit()
+
+    task_dict={}
+
+    if completed_at == None:
+        task_dict['is_complete'] = False
+    else:
+        task_dict['is_complete'] = True
+
+    task_dict['id'] = task.id
+    task_dict['title'] = task.title
+    task_dict['description'] = task.description
+    
+    return_dict = {"task": task_dict}
+    return jsonify(return_dict), 200
+
+#------------PUT Method - update task by id - Mark_complete---------
+def send_slack_message(task_title):
+    params = {"channel":"task-notifications","text":task_title}
+    headers = {"Authorization":slack_token}
+    requests.post("https://slack.com/api/chat.postMessage", params=params, headers=headers)
+
+@tasks_bp.route("/<id>/mark_complete", methods=["PATCH"])
+def patch_completed_task_by_id(id):
+    task = Task.query.get(id)
+
+    if (task == None):
+        abort(make_response({"message":f"task {id} not found"}, 404))
+
+    
+    task.completed_at = date.today()
+    
+    db.session.commit()
+
+    send_slack_message(task.title)
+
+    task_dict={}
+    task_dict['id'] = task.id
+    task_dict['title'] = task.title
+    task_dict['description'] = task.description
+    task_dict['is_complete'] = True
+    return_dict = {"task": task_dict}
+    return jsonify(return_dict), 200
+
+#------------PUT Method - update task by id - Mark_Incomplete---------
+@tasks_bp.route("/<id>/mark_incomplete", methods=["PATCH"])
+def patch_incomplete_task_by_id(id):
+    task = Task.query.get(id)
+
+    if (task == None):
+        abort(make_response({"message":f"task {id} not found"}, 404))
+
+    
+    task.completed_at = None
+    
+    db.session.commit()
+
+    task_dict={}
+    task_dict['id'] = task.id
+    task_dict['title'] = task.title
+    task_dict['description'] = task.description
+    task_dict['is_complete'] = False
+    return_dict = {"task": task_dict}
+    return jsonify(return_dict), 200
+#----------------------------------------------------------------------
+# ---------------GOAL-----------------------------------------------
+#----------------------------------------------------------------------
+# This is the BluePrint object that helps to "connect" my functions to
+# endpoints and HTTP methods for goals.
+goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@goals_bp.route("", methods=["POST"])
+def post_goal():
+    # request.get_json() returns a dictionary with keys: "title"
+    # Use corresponding values to create the Task instance.
+    post_dict = request.get_json()
+    print(post_dict)
+    
+    if 'title' not in post_dict:
+        return make_response({"details":"Invalid data"},400)
+    
+    title = post_dict['title']
+    goal = Goal(title=title)
+    db.session.add(goal)
+    db.session.commit()
+
+    goal_dict={}
+    goal_dict['id'] = goal.id
+    goal_dict['title'] = goal.title
+    return_dict = {"goal": goal_dict}
+    return jsonify(return_dict), 201
+
+#------------GET ALL GOALS---------------
+@goals_bp.route("", methods=["GET"]) 
+def get_all_goals():
+    
+    goal_db = Goal.query.all()
+
+    
+    goal_dict = {}
+    goals_response = [] 
+    for goal in goal_db:  
+        goal_dict = {'id': goal.id,
+                'title': goal.title
+    }             
+        goals_response.append(goal_dict)
+    return jsonify(goals_response), 200  
+
+#-----------------------------------
+@goals_bp.route("/<id>",methods = ["GET"]) 
+def get_goal_by_id(id):
+    # Remember that id from the request is a string and not an integer
+
+    goal = Goal.query.get(id)
+    if (goal == None):
+        abort(make_response({"message":f"goal {id} not found"}, 404))
+    else:
+        goal_dict={}
+        goal_dict['id'] = goal.id
+        goal_dict['title'] = goal.title
+        return_dict = {"goal": goal_dict}
+        return jsonify(return_dict), 200
+
+#------------PUT Method - update goal by id---------
+@goals_bp.route("/<id>", methods=["PUT"])
+def update_goal_by_id(id):
+    goal = Goal.query.get(id)
+    
+    if (goal == None):
+        abort(make_response({"message":f"goal {id} not found"}, 404))
+
+    update_dict = request.get_json()
+    if 'title' not in update_dict:
+        return make_response({"details":"Invalid data"},400)
+
+    title = update_dict['title']
+    goal.title = title
+    
+    db.session.commit()
+
+    goal_dict={}
+    goal_dict['id'] = goal.id
+    goal_dict['title'] = goal.title
+    
+    return_dict = {"goal": goal_dict}
+    return jsonify(return_dict), 200
+#------------remove goal by id------------
+@goals_bp.route("/<id>", methods=["DELETE"])
+def remove_goal_by_id(id):
+    goal = Goal.query.get(id)
+    
+    if (goal == None):
+        abort(make_response({"message":f"goal {id} not found"}, 404))
+    
+    db.session.delete(goal)
+    db.session.commit()
+    return make_response({"details":f"Goal {id} \"{goal.title}\" successfully deleted"},200)
+#------------------------------------------------
+#----------------WAVE 6-------------------------
+#---------------------------------------------------
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def associate_tasks_with_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+    task_ids_dict = request.get_json()
+    task_ids = task_ids_dict['task_ids']
+    for id in task_ids:
+        task = Task.query.get(id)
+        task.goal = goal
+        db.session.commit()
+    
+    response_dict = {
+        "id": int(goal_id),
+        "task_ids": task_ids
+    }
+    return jsonify(response_dict), 200
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_tasks_associated_with_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+    if goal == None:
+        abort(make_response({"message":f"goal {goal_id} not found"}, 404))
+    
+    tasks = goal.tasks # list of all task instances associated with the goal_id
+    task_dicts = []
+    for task in tasks:
+        if task.completed_at == None:
+            is_complete = False
+        else:
+            is_complete = True
+        task_dict = {
+            "id": task.id,
+            "goal_id": goal.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": is_complete
+        }
+        task_dicts.append(task_dict)
+
+    response_dict = {
+        "id": goal.id,
+        "title": goal.title,
+        "tasks": task_dicts
+    }
+    return jsonify(response_dict), 200
\ No newline at end of file
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/07116c5880a9_established_relationship_between_goal_.py b/migrations/versions/07116c5880a9_established_relationship_between_goal_.py
new file mode 100644
index 000000000..6f024b675
--- /dev/null
+++ b/migrations/versions/07116c5880a9_established_relationship_between_goal_.py
@@ -0,0 +1,30 @@
+"""established relationship between goal and tasks
+
+Revision ID: 07116c5880a9
+Revises: c185c79f2cc0
+Create Date: 2022-05-11 19:53:12.996323
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '07116c5880a9'
+down_revision = 'c185c79f2cc0'
+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/9b38f8c936d2_adds_task_model.py b/migrations/versions/9b38f8c936d2_adds_task_model.py
new file mode 100644
index 000000000..6a52bf65c
--- /dev/null
+++ b/migrations/versions/9b38f8c936d2_adds_task_model.py
@@ -0,0 +1,34 @@
+"""adds Task model
+
+Revision ID: 9b38f8c936d2
+Revises: 
+Create Date: 2022-05-09 18:43:11.464623
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9b38f8c936d2'
+down_revision = None
+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=True),
+    sa.Column('description', sa.String(), nullable=True),
+    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/c185c79f2cc0_.py b/migrations/versions/c185c79f2cc0_.py
new file mode 100644
index 000000000..d01efb0cb
--- /dev/null
+++ b/migrations/versions/c185c79f2cc0_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: c185c79f2cc0
+Revises: 9b38f8c936d2
+Create Date: 2022-05-11 14:52:02.707916
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c185c79f2cc0'
+down_revision = '9b38f8c936d2'
+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=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index 30ff414fe..1fc227276 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,10 @@ autopep8==1.5.5
 blinker==1.4
 certifi==2020.12.5
 chardet==4.0.0
+charset-normalizer==2.0.12
 click==7.1.2
+coverage==6.3.2
+DateTime==4.4
 Flask==1.1.2
 Flask-Migrate==2.6.0
 Flask-SQLAlchemy==2.4.4
@@ -26,9 +29,13 @@ pytest-cov==2.12.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-editor==1.0.4
+pytz==2022.1
 requests==2.25.1
 six==1.15.0
 SQLAlchemy==1.3.23
 toml==0.10.2
+tomli==2.0.1
 urllib3==1.26.5
 Werkzeug==1.0.1
+wonderwords==2.2.0
+zope.interface==5.4.0
diff --git a/tests/conftest.py b/tests/conftest.py
index 6639378e6..59f2076d7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,7 +5,7 @@
 from app import db
 from datetime import datetime
 from flask.signals import request_finished
-
+from datetime import date
 
 @pytest.fixture
 def app():
@@ -24,7 +24,6 @@ def expire_session(sender, response, **extra):
     with app.app_context():
         db.drop_all()
 
-
 @pytest.fixture
 def client(app):
     return app.test_client()
@@ -36,11 +35,18 @@ def client(app):
 @pytest.fixture
 def one_task(app):
     new_task = Task(
-        title="Go on my daily walk 🏞", description="Notice something new every day", completed_at=None)
+        title="Go on my daily walk 🏞", description="Notice something new every day")
+    db.session.add(new_task)
+    db.session.commit()
+#------------
+@pytest.fixture
+def completed_task(app):
+    new_task = Task(
+        title="Go on my daily walk 🏞", description="Notice something new every day", completed_at = date.today())
     db.session.add(new_task)
     db.session.commit()
 
-
+    
 # This fixture gets called in every test that
 # references "three_tasks"
 # This fixture creates three tasks and saves
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..79c31ae53 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -1,8 +1,9 @@
 from app.models.task import Task
+
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -13,7 +14,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -32,7 +33,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -51,7 +52,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -59,14 +60,15 @@ 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")
+    # 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 +95,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={
@@ -113,13 +115,10 @@ def test_update_task(client, one_task):
             "is_complete": False
         }
     }
-    task = Task.query.get(1)
-    assert task.title == "Updated Task Title"
-    assert task.description == "Updated Test Description"
-    assert task.completed_at == None
+    
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -130,14 +129,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 +152,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 +161,18 @@ 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***************
     # *****************************************************************
 
-    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 +189,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..c9a76e6b1 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..2ba564b6e 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,14 @@ def test_mark_complete_missing_task(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_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -142,8 +142,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 +152,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 +182,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..4763e4436 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")
@@ -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,25 @@ 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
+    
+    #raise Exception("Complete test")
+    
     # ---- Complete Test ----
+    assert response.status_code == 404
+    assert response_body['message'] == "goal 1 not found"
     # 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 +84,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"
+        }
+    }
+    
+    
 
 
-@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 ----
+    #raise Exception("Complete test")
+    
+    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
-    # ---- 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")
@@ -124,27 +137,29 @@ def test_delete_goal(client, one_goal):
     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***************
     # *****************************************************************
 
 
-@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
-    # ---- 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_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..dea1b0a3f 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,15 @@ 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'] == "goal 1 not found"
+    
+    #raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@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 +75,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 +100,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()