diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..c4d3a3ba9 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -16,7 +16,7 @@ def create_app(test_config=None):
 
     if test_config is None:
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_DATABASE_URI")
+            "RENDER_DATABASE_URI")
     else:
         app.config["TESTING"] = True
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
@@ -30,5 +30,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .routes.task_routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
+    from .routes.goal_routes import goals_bp
+    app.register_blueprint(goals_bp)
+    
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..fb402c954 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,26 @@
 from app import db
 
 
+
 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 to_dict(self, tasks=False):
+
+        build_dict = {
+            "id": self.goal_id,
+            "title": self.title
+        }
+        
+        if tasks:
+            build_dict["tasks"] = [task.to_dict() for task in self.tasks]
+
+        return build_dict
+    
+    @classmethod
+    def from_dict(cls, build_dict):
+        new_goal = cls(title=build_dict["title"])
+        return new_goal
+
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..c2ac371c6 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -2,4 +2,41 @@
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    task_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(timezone=True), nullable=True)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True)
+    goal = db.relationship("Goal", back_populates="tasks")
+    
+    
+    def to_dict(self):
+
+        task_dict = dict(
+            id = self.task_id,
+            title = self.title,
+            description = self.description,
+            is_complete = self.is_task_complete()
+        )
+
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+
+        return task_dict
+    
+    def is_task_complete(self):
+        if self.completed_at == None:
+            return False
+        else:
+            return True
+        
+    @classmethod
+    def from_dict(cls, task_dict):
+        new_task = Task(
+            title=task_dict["title"],
+            description=task_dict["description"],
+            )
+        return new_task
+    
+
+
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..1488d4cf0
--- /dev/null
+++ b/app/routes/goal_routes.py
@@ -0,0 +1,59 @@
+from flask import Blueprint, make_response, request
+from app.models.goal import Goal
+from app.models.task import Task
+from app.routes.helpers import validate_model, create_item, get_all_items, get_one_item, update_item, delete_item
+from app import db
+
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@goals_bp.route("", methods=["POST"])
+def create_goal():
+    return create_item(Goal)
+
+
+@goals_bp.route("", methods=["GET"])
+def get_all_goals():
+    return get_all_items(Goal)
+
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def get_one_goal(goal_id):
+    return get_one_item(Goal, goal_id)
+    
+
+@goals_bp.route("<goal_id>", methods=["PUT"])
+def update_task(goal_id):
+    return update_item(Goal, goal_id)
+    
+
+@goals_bp.route("<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    return delete_item(Goal, goal_id)
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=['POST'])
+def create_goal_with_tasks(goal_id):
+
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    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()
+
+    message = {
+        "id": goal.goal_id, 
+        "task_ids": task_ids
+        }
+
+    return make_response(message, 200)
+
+        
+@goals_bp.route("/<goal_id>/tasks", methods=['GET'])
+def get_all_tasks_one_goal(goal_id):
+
+    goal = validate_model(Goal, goal_id)
+    return make_response(goal.to_dict(tasks=True), 200)
\ No newline at end of file
diff --git a/app/routes/helpers.py b/app/routes/helpers.py
new file mode 100644
index 000000000..3cafb789f
--- /dev/null
+++ b/app/routes/helpers.py
@@ -0,0 +1,140 @@
+from flask import jsonify, abort, make_response, request
+from dotenv import load_dotenv
+import requests
+from datetime import datetime
+from app import db
+import os
+
+load_dotenv()
+
+def send_slack_message(completed_task):
+    TOKEN = os.environ['SLACK_API_TOKEN']
+    AUTH_HEADERS = {
+        "Authorization": f"Bearer {TOKEN}"
+    }
+    CHANNEL_ID = "C0561UUDX4K"
+    SLACK_URL = "https://slack.com/api/chat.postMessage"
+
+    try:
+        message = f"Someone just completed the task {completed_task.title}"
+        payload = {
+            "channel": CHANNEL_ID,
+            "text": message
+            }
+    
+        requests.post(SLACK_URL, data = payload, headers = AUTH_HEADERS)
+    
+    except:
+        print("There was an error making the call to Slack")
+
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"details": "Invalid data"}, 400))
+
+    model = cls.query.get(model_id)
+
+    if not model:
+        message = {"details": "Invalid data"}
+        abort(make_response(message, 404))
+
+    return model
+
+
+def create_item(cls):
+
+    request_body = request.get_json()
+
+    try:
+        new_item = cls.from_dict(request_body)
+        db.session.add(new_item)
+        db.session.commit()
+        return make_response({cls.__name__.lower(): new_item.to_dict()}, 201)
+    except:
+        return make_response({"details": "Invalid data"}, 400)
+    
+
+def get_all_items(cls):
+
+    sort_query = request.args.get("sort")
+
+    if sort_query == "asc":
+        items = cls.query.order_by(cls.title)
+    
+    elif sort_query == "desc":
+        items = cls.query.order_by(cls.title.desc())
+
+    else:
+        items = cls.query.all()
+
+    if request.args.get("title"):
+        items = cls.query.filter(cls.title== request.args.get("title"))
+
+    items_response = [item.to_dict() for item in items]
+
+    return jsonify(items_response), 200
+
+
+def get_one_item(cls, model_id):
+
+    item = validate_model(cls, model_id)
+    return make_response({cls.__name__.lower(): item.to_dict()}), 200
+    
+
+def update_item(cls, model_id):
+    try:
+        item = validate_model(cls, model_id)
+        request_body = request.get_json()
+        
+        for key, value in request_body.items():
+            setattr(item, key, value)
+
+        db.session.commit()
+
+        return make_response({cls.__name__.lower(): item.to_dict()}, 200)
+    
+    except:
+        return jsonify({"Message": "Invalid id"}), 404
+    
+
+def delete_item(cls, model_id):
+
+    item = validate_model(cls, model_id)
+
+    db.session.delete(item)
+    db.session.commit()
+
+    message = {"details": f"{cls.__name__} {model_id} \"{item.title}\" successfully deleted"}
+    return make_response(message, 200)
+
+
+def mark_item_complete(cls, model_id):
+    try:
+        new_item = validate_model(cls, model_id)
+    except:
+        return jsonify({"Message": "Invalid id"}), 404
+    
+    new_item.completed_at = datetime.utcnow()
+
+    send_slack_message(new_item)
+
+    db.session.commit()
+
+    return jsonify({"task": new_item.to_dict()}), 200
+
+
+def mark_item_incomplete(cls, model_id):
+
+    try:
+        new_item = validate_model(cls, model_id)
+    except:
+        return jsonify({"Message": "Invalid id"}), 404
+
+    new_item.completed_at = None
+    
+    db.session.commit()
+
+    return jsonify({"task": new_item.to_dict()}), 200
+
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
new file mode 100644
index 000000000..07599042a
--- /dev/null
+++ b/app/routes/task_routes.py
@@ -0,0 +1,41 @@
+from flask import Blueprint
+from app.models.task import Task
+from app.routes.helpers import create_item, get_all_items, get_one_item, update_item, delete_item, mark_item_complete, mark_item_incomplete
+
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+    return create_item(Task)
+
+
+@tasks_bp.route("", methods=["GET"])
+def get_all_tasks():
+    return get_all_items(Task)
+
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def get_one_task(task_id):
+    return get_one_item(Task, task_id)
+
+
+@tasks_bp.route("<task_id>", methods=["PUT"])
+def update_task(task_id):
+    return update_item(Task, task_id)
+
+
+@tasks_bp.route("<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    return delete_item(Task, task_id)
+
+
+@tasks_bp.route("<task_id>/mark_complete", methods=["PATCH"])
+def mark_task_complete(task_id):
+    return mark_item_complete(Task, task_id)
+
+
+@tasks_bp.route("<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_task_incomplete(task_id):
+    return mark_item_incomplete(Task, task_id)
\ 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/623d6d489109_dropped_and_established_new_databses_.py b/migrations/versions/623d6d489109_dropped_and_established_new_databses_.py
new file mode 100644
index 000000000..54600358e
--- /dev/null
+++ b/migrations/versions/623d6d489109_dropped_and_established_new_databses_.py
@@ -0,0 +1,42 @@
+"""Dropped and established new databses for deployment
+
+Revision ID: 623d6d489109
+Revises: 
+Create Date: 2023-05-15 10:12:34.890880
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '623d6d489109'
+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.Column('title', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('task',
+    sa.Column('task_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(timezone=True), nullable=True),
+    sa.Column('goal_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ),
+    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/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..df69a6013 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")
@@ -50,8 +50,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 +58,10 @@ def test_get_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 == {'details': 'Invalid data'}
 
 
-@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 +88,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 +114,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 +125,10 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"Message": "Invalid id"}, 404
 
-    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 +143,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 +151,12 @@ 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 == {'details': 'Invalid data'}
 
     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 +173,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..d185258a5 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,10 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {'Message': 'Invalid id'}
 
-    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 +138,6 @@ def test_mark_incomplete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    response_body == {'Message': 'Invalid id'}
+
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..d82aa1736 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
+from app.models.goal import Goal
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -46,22 +47,17 @@ 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 ----
+    response.status_code == 404
+    response_body == {'details': 'Invalid data'}
 
 
-@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 +76,42 @@ 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
+
+    response = client.put("/goals/1", json={
+        "title": "Update Goal"})
     # ---- Complete Act Here ----
+    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": "Update Goal"
+        }
+    }
+
+    goal=Goal.query.get(1)
+    assert goal.title == "Update Goal"
 
 
-@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 ----
-
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    response = client.put("/goals/2", json={
+        "title": "Updated Goal",
+    })
 
+    response_body = response.get_json()
+ 
+    assert response.status_code == 404
+    assert response_body == {"Message": "Invalid id"}, 404
 
-@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 +126,23 @@ 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")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {'details': 'Invalid data'}
 
 
-@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/2")
+    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 == {'details': 'Invalid data'}
 
 
-@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..aac534f81 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,8 @@ 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 +43,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,18 +51,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")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {"details": "Invalid data"}
 
 
-@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")
     response_body = response.get_json()
+    print(response_body)
 
     # Assert
     assert response.status_code == 200
@@ -72,13 +70,15 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
         "title": "Build a habit of going outside daily",
         "tasks": []
     }
+    print(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(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
     response_body = response.get_json()
+    print(response_body)
 
     # Assert
     assert response.status_code == 200
@@ -99,7 +99,8 @@ 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()