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/app/__init__.py b/app/__init__.py
index 2764c4cc8..327c78ccd 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,6 +5,7 @@
 from dotenv import load_dotenv
 
 
+
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
@@ -30,5 +31,9 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .task_routes import task_bp
+    app.register_blueprint(task_bp)
+    from .goal_routes import goal_bp
+    app.register_blueprint(goal_bp) 
 
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
new file mode 100644
index 000000000..b2d32b6c7
--- /dev/null
+++ b/app/goal_routes.py
@@ -0,0 +1,122 @@
+from app import db
+from .models.task import Task
+from .models.goal import Goal
+from flask import Blueprint, request, make_response, jsonify, abort
+import sqlalchemy
+from .route_helpers import validate_model_id
+import random
+
+
+
+goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals")
+
+# all goal methods
+    # Create
+@goal_bp.route("", methods=["POST"])
+def create_goal():
+    
+    request_body = request.get_json()
+    new_goal = Goal.from_dict(request_body)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return make_response({"goal" : new_goal.to_dict()}, 201)
+    
+    # Read
+@goal_bp.route("", methods=["GET"])
+def get_all_goals():
+    
+    sort_query = request.args.get("sort")
+    if sort_query:
+        sort_function = getattr(sqlalchemy, sort_query)
+        goal_list = Goal.query.order_by(sort_function(Goal.title))
+    else:
+        goal_list = Goal.query.all()
+
+    response = []    
+    for goal in goal_list:
+        response.append(goal.to_dict())
+    
+    return jsonify(response), 200  
+
+@goal_bp.route("random", methods=["GET"])
+def get_random_goal():
+    goal_list = Goal.query.all()
+    max_index = len(goal_list) - 1
+    rand_goal = goal_list[random.randint(0,max_index)]
+
+    return jsonify({"goal" : rand_goal.to_dict()}), 200
+
+
+
+# Individual goal methods
+
+    # Read
+@goal_bp.route("/<goal_id>", methods=["GET"])
+def get_specific_goal(goal_id): 
+    
+    goal = validate_model_id(Goal, goal_id)
+    
+    return {"goal" : goal.to_dict()}, 200
+
+    # Update
+@goal_bp.route ("/<goal_id>", methods=["PUT"])
+def update_goal(goal_id):
+    goal = validate_model_id(Goal, goal_id)
+    
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return {"goal" : goal.to_dict()}, 200
+
+@goal_bp.route("<goal_id>/<marker>", methods=["PATCH"])
+def mark_goal_status(goal_id, marker):
+    goal = validate_model_id(Goal, goal_id)
+    eval("goal." + marker + "()")
+    
+    db.session.commit()
+
+    return {"goal" : goal.to_dict()}, 200
+
+    # Delete
+@goal_bp.route("/<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = validate_model_id(Goal, goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+    
+    return make_response({"details" : f"Goal {goal_id} \"{goal.title}\" successfully deleted"}, 200)
+
+
+# Nested route for task assigned to one goal
+
+@goal_bp.route("/<goal_id>/tasks", methods=["POST"])
+def post_task_ids_to_goal(goal_id):
+    goal = validate_model_id(Goal, goal_id)
+
+    request_body = request.get_json()
+
+    
+    for task_id in request_body["task_ids"]:
+        new_task = validate_model_id(Task, task_id)
+        new_task.goal_id = goal_id
+        
+    db.session.commit()
+
+    return make_response({
+        "id" : goal.id,
+        "task_ids" : goal.get_task_ids()
+    }, 200)
+
+@goal_bp.route("/<goal_id>/tasks", methods=["GET"])
+def get_tasks_from_goal(goal_id):
+    goal = validate_model_id(Goal, goal_id)
+    response_body = goal.to_dict()
+    response_body.update({"tasks" : goal.get_tasks()})
+
+    return make_response(response_body, 200)
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..668e89ea3 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,39 @@
 from app import db
+from flask import abort, make_response
 
 
 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")
+
+    def to_dict(self):
+        goal_dict = {
+            "id" : self.id,
+            "title" : self.title,
+            }
+        return goal_dict
+
+    def get_tasks(self):
+        response = []
+        for task in self.tasks:
+            response.append(task.to_dict())
+        return response
+
+    def get_task_ids(self):
+        response = []
+        for task in self.tasks:
+            response.append(task.id)
+        return response
+
+    
+    
+    @classmethod
+    def from_dict(cls, request_body):
+        try:
+            goal = Goal(title = request_body["title"]) 
+            return goal
+        except:
+            abort(make_response({"details" : "Invalid data"}, 400))
+
+        
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..3478f65af 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,52 @@
 from app import db
+from flask import abort, make_response
+import datetime
 
 
 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 = db.relationship("Goal", back_populates="tasks")
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable = True)
+    
+
+
+    def is_complete(self):
+        if self.completed_at == None:
+            return False
+        else:
+            return True
+    
+    def to_dict(self):
+        task_dict = {
+            "id" :self.id,
+            "title" : self.title,
+            "description" : self.description, 
+            "is_complete" : self.is_complete()
+            }
+        if self.goal_id != None:
+            task_dict.update({"goal_id" : self.goal_id})
+        return task_dict
+    
+    def mark_complete(self):
+        if self.is_complete():
+            pass
+        else:
+            self.completed_at = datetime.datetime.now()
+        
+    def mark_incomplete(self):
+        if not self.is_complete():
+            pass
+        else:
+            self.completed_at = None           
+
+    @classmethod
+    def from_dict(cls, request_body):
+        try:
+            task = Task(title = request_body["title"],
+                        description = request_body["description"]) 
+            return task
+        except:
+            abort(make_response({"details" : "Invalid data"}, 400))
diff --git a/app/route_helpers.py b/app/route_helpers.py
new file mode 100644
index 000000000..dfc460475
--- /dev/null
+++ b/app/route_helpers.py
@@ -0,0 +1,19 @@
+
+from flask import make_response, abort
+
+
+
+def validate_model_id(cls, id):
+    cls_name = cls.__name__
+
+    try:
+        id = int(id)
+    except:
+        abort(make_response({"message" : f"{cls_name.lower()} id: {id} is invalid"}, 400))
+
+    model = cls.query.get(id)
+
+    if not model:
+        abort(make_response({"message" : f"{cls_name.lower()} {id} not found"}, 404))
+
+    return model
\ No newline at end of file
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/task_routes.py b/app/task_routes.py
new file mode 100644
index 000000000..2695252d1
--- /dev/null
+++ b/app/task_routes.py
@@ -0,0 +1,86 @@
+from app import db
+from .models.task import Task
+from .models.goal import Goal
+from flask import Blueprint, request, make_response, jsonify, abort
+import sqlalchemy 
+from .route_helpers import validate_model_id
+
+
+
+task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks")
+
+
+# all task methods
+    # Create
+@task_bp.route("", methods=["POST"])
+def create_task():
+    
+    request_body = request.get_json()
+    new_task = Task.from_dict(request_body)
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    return make_response({"task" : new_task.to_dict()}, 201)
+    
+    # Read
+@task_bp.route("", methods=["GET"])
+def get_all_task():
+    
+    sort_query = request.args.get("sort")
+    if sort_query:
+        sort_function = getattr(sqlalchemy, sort_query)
+        task_list = Task.query.order_by(sort_function(Task.title))
+    else:
+        task_list = Task.query.all()
+    
+    response = []    
+    for task in task_list:
+        response.append(task.to_dict())
+    
+    return jsonify(response), 200  
+
+
+
+# Individual task methods
+
+    # Read
+@task_bp.route("/<task_id>", methods=["GET"])
+def get_one_task(task_id): 
+    
+    task = validate_model_id(Task, task_id)
+    
+    return {"task" : task.to_dict()}, 200
+
+    # Update
+@task_bp.route ("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+    task = validate_model_id(Task, task_id)
+    
+    request_body = request.get_json()
+
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+
+    db.session.commit()
+
+    return {"task" : task.to_dict()}, 200
+
+@task_bp.route("<task_id>/<marker>", methods=["PATCH"])
+def mark_task_status(task_id, marker):
+    task = validate_model_id(Task, task_id)
+    eval("task." + marker + "()")
+    
+    db.session.commit()
+
+    return {"task" : task.to_dict()}, 200
+
+    # Delete
+@task_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = validate_model_id(Task, task_id)
+
+    db.session.delete(task)
+    db.session.commit()
+    
+    return make_response({"details" : f"Task {task_id} \"{task.title}\" successfully deleted"}, 200)
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/169c9ca46d4d_.py b/migrations/versions/169c9ca46d4d_.py
new file mode 100644
index 000000000..fc1829c25
--- /dev/null
+++ b/migrations/versions/169c9ca46d4d_.py
@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 169c9ca46d4d
+Revises: 
+Create Date: 2022-11-17 15:13:06.677176
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '169c9ca46d4d'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    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.Column('goal_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['goal_id'], ['goal.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/tests/conftest.py b/tests/conftest.py
index 6639378e6..d5f062618 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -79,6 +79,15 @@ def one_goal(app):
     db.session.add(new_goal)
     db.session.commit()
 
+@pytest.fixture
+def three_goals(app):
+    db.session.add_all([
+        Goal(title="Eat Three Meals a Day"),
+        Goal(title="Do 3 tattoos a week"),
+        Goal(title="Get Better at Texting Friends"),
+    ])
+    db.session.commit()
+
 
 # This fixture gets called in every test that
 # references "one_task_belongs_to_one_goal"
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..3c44ce88d 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -51,7 +51,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -60,13 +60,15 @@ def test_get_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"message" : "task 1 not found"}
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +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={
@@ -119,7 +121,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -131,13 +133,14 @@ def test_update_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"message" : "task 1 not found"}
+    
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +155,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 +164,16 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
     assert Task.query.all() == []
+    assert response_body == {"message" : "task 1 not found"}
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +190,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..85986da51 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -3,12 +3,7 @@
 from datetime import datetime
 from app.models.task import Task
 import pytest
-
-
-@pytest.mark.skip(reason="No way to test this feature yet")
-def test_mark_complete_on_incomplete_task(client, one_task):
-    # Arrange
-    """
+"""
     The future Wave 4 adds special functionality to this route,
     so for this test, we need to set-up "mocking."
 
@@ -19,7 +14,12 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     test (due to Wave 4).
 
     There is no action needed here, the tests should work as-is.
-    """
+"""
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
+def test_mark_complete_on_incomplete_task(client, one_task):
+    # Arrange
+
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 
@@ -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,21 +62,9 @@ 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
-    """
-    The future Wave 4 adds special functionality to this route,
-    so for this test, we need to set-up "mocking."
-
-    Mocking will help our tests work in isolation, which is a
-    good thing!
-
-    We need to mock any POST requests that may occur during this
-    test (due to Wave 4).
-
-    There is no action needed here, the tests should work as-is.
-    """
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 
@@ -99,7 +87,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 +107,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     assert Task.query.get(1).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -128,13 +116,13 @@ def test_mark_complete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"message" : "task 1 not found"}
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -143,7 +131,8 @@ def test_mark_incomplete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert response_body == {"message" : "task 1 not found"}
\ No newline at end of file
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..3e6cd9c28 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,9 @@
 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 +14,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")
@@ -28,8 +30,17 @@ def test_get_goals_one_saved_goal(client, one_goal):
         }
     ]
 
+def test_get_one_random_goal(client, three_goals):
+    response = client.get("/goals/random")
+    response_body = response.get_json()
+
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert len(response_body) == 1
+    
+
 
-@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 +57,19 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
     pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
-    # Assert
-    # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+
+    assert response_body == {"message" : f"goal 1 not found"}
+    assert response.status_code == 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_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -80,34 +88,44 @@ 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": "An updated, more-acheivable, easier goal"
+        })
+
+    response_body = response.get_json()
+
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
+    goal = Goal.query.get(1)
+    assert response_body == {"goal" :{
+            "id" : 1,
+            "title" : "An updated, more-acheivable, easier goal"
+    }}
+    assert response.status_code == 200
+    assert goal.title == "An updated, more-acheivable, easier 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")
     # Act
-    # ---- Complete Act Here ----
-
+    response = client.put("/goals/1", json={
+            "title": "An updated, more-acheivable, easier goal"
+        })
+    response_body = response.get_json()
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    
+    assert response_body == {"message" : f"goal 1 not found"}
+    assert response.status_code == 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")
@@ -124,27 +142,21 @@ 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")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
+    response_body = response.get_json()
+    assert response_body == {"message" : "goal 1 not found"}
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
 
     # Act
-    # ---- Complete Act Here ----
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
 
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 404
+    assert response_body == {"message" : "goal 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..c81ab58f9 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")
@@ -51,13 +51,13 @@ def test_get_tasks_for_specific_goal_no_goal(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    # raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    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_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()