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..74797ff6d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,5 +30,9 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .task_routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
+    from .goal_routes import goals_bp
+    app.register_blueprint(goals_bp)
     return app
diff --git a/app/goal_routes.py b/app/goal_routes.py
new file mode 100644
index 000000000..1f40f9c16
--- /dev/null
+++ b/app/goal_routes.py
@@ -0,0 +1,99 @@
+
+from datetime import datetime
+from flask import Blueprint, jsonify, make_response, request, abort
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from sqlalchemy import desc #(used in read_all_tasks for sorting)
+import os 
+from .task_routes import validate_model
+
+goals_bp = Blueprint("goal", __name__, url_prefix="/goals")
+
+#CREATE Routes (Wave 5: CRUD Routes for goal model)
+
+@goals_bp.route('', methods=['POST'])
+def create_goal():
+    request_body = request.get_json()
+    try:
+        new_goal = Goal.from_dict(request_body)
+    except KeyError:
+        return jsonify ({"details": "Invalid data"}), 400
+    
+    db.session.add(new_goal)
+    db.session.commit()
+    
+    return jsonify({"goal": new_goal.to_dict()}), 201
+
+
+@goals_bp.route('', methods=["GET"])
+def get_all_goals():
+    all_goals = Goal.query.all()
+
+    result = [item.to_dict() for item in all_goals]
+
+    return jsonify(result), 200
+
+@goals_bp.route("<goal_id>", methods=["GET"])
+def read_goal_by_id(goal_id): 
+    chosen_goal = validate_model(Goal, goal_id)
+    
+    return jsonify({"goal": chosen_goal.to_dict()}), 200
+
+@goals_bp.route('/<goal_id>', methods=['PUT'])
+def update_one_goal(goal_id):
+    update_goal = validate_model(Goal, goal_id)
+
+    request_body = request.get_json()
+
+    try:
+        update_goal.title = request_body["title"]
+    except KeyError:
+        return jsonify({"msg": "Missing needed data"}), 400
+    
+    db.session.commit()
+    return jsonify({"msg": f"Successfully updated goal with id {update_goal.goal_id}"}), 200
+
+@goals_bp.route('/<goal_id>', methods=['DELETE'])
+def delete_one_goal(goal_id):
+    goal_to_delete = validate_model(Goal, goal_id)
+
+    db.session.delete(goal_to_delete)
+    db.session.commit()
+
+    return jsonify({"details": f'Goal {goal_to_delete.goal_id} "{goal_to_delete.title}" successfully deleted'}), 200
+
+#Wave 6: Nested Routes
+@goals_bp.route('/<goal_id>/tasks', methods=['POST'])
+def add_task_ids_to_goal(goal_id):
+    chosen_goal = validate_model(Goal, goal_id)
+    
+    request_body = request.get_json()
+    task_ids = request_body["task_ids"]
+
+    for id in task_ids:
+        #task = Task.query.get(int(id))
+        task = validate_model(Task, id)
+        if task not in chosen_goal.tasks:
+            chosen_goal.tasks.append(task)
+            #db.session.add(task)
+            db.session.commit()
+    
+    return jsonify({
+        "id" : int(goal_id),
+        "task_ids": task_ids
+    }), 200
+
+@goals_bp.route('/<goal_id>/tasks', methods=['GET'])
+def get_tasks_by_goal_id(goal_id):
+    chosen_goal = validate_model(Goal, goal_id)
+
+    return jsonify(chosen_goal.to_dict_incl_tasks()), 200
+    
+    
+
+
+
+
+        
+
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..83a00b9fa 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,4 +2,43 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    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):
+        return {
+            "id": self.goal_id,
+            "title": self.title
+        }
+    
+    def to_dict_incl_tasks(self):
+        tasks = self.get_task_items()
+
+        return {
+            "id": self.goal_id,
+            "title": self.title,
+            "tasks": tasks
+        }
+    
+    #Helper method to use in to_dict_incl_tasks()
+    def get_task_items(self):
+        if self.tasks is None:
+            return None
+        list_of_tasks = [item.to_dict_incl_goal_id() for item in self.tasks]
+        return list_of_tasks
+
+    @classmethod
+    def from_dict(cls, dict):
+        return cls (
+            title = dict["title"],
+        ) if len(dict) == 1 else cls (
+            title = dict["title"],
+            description = dict["description"],
+            tasks = dict["tasks"]
+        )
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..5f6ce9726 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,60 @@
 from app import db
 
+#Wave 1: CRUD for One Model
 
 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,
+        default = None)
+    goal_id = db.Column(
+        db.Integer,
+        db.ForeignKey("goal.goal_id"),
+        nullable = True)
+    goal = db.relationship(
+        "Goal", 
+        back_populates='tasks')
+    
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": False if self.completed_at is None else True
+        }
+    # Source: 
+    # https://stackoverflow.com/questions/52325025/use-of-if-else-inside-a-dict-to-set-a-value-to-key-using-python
+
+    def to_dict_incl_goal_id(self):
+        return{
+            "id": self.id,
+            "goal_id": self.goal_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": False if self.completed_at is None else True    
+        }
+    @classmethod
+    def from_dict(cls, dict):
+        return cls (
+            title = dict["title"],
+            description = dict["description"]
+        ) if len(dict) == 2 else cls (
+            title = dict["title"],
+            description = dict["description"],
+            completed_at = dict["completed_at"]
+        )
+
+
+
+
+        
+
+
+
+
+
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..a953ad738
--- /dev/null
+++ b/app/task_routes.py
@@ -0,0 +1,157 @@
+from datetime import datetime
+from flask import Blueprint, jsonify, make_response, request, abort
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from sqlalchemy import desc #(used in read_all_tasks for sorting)
+import requests
+import os 
+# from slackclient import SlackClient #Alternate method 3 (below to call external api)
+
+SLACK_TOKEN = os.environ.get('SLACK_TOKEN', None)
+# slack_client = SlackClient(SLACK_TOKEN) #Alternate method 3
+
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+#CREATE Routes (Wave 1: CRUD Routes)
+@tasks_bp.route("", methods=["POST"])
+def create_task():
+        request_body = request.get_json()
+
+        try:
+            new_task = Task.from_dict(request_body)
+        except KeyError:
+            return jsonify ({"details": "Invalid data"}), 400
+        
+        db.session.add(new_task)
+        db.session.commit()
+        
+        return jsonify({"task": new_task.to_dict()}), 201
+
+#READ Routes (Wave 1: CRUD routes)
+@tasks_bp.route("", methods=["GET"])
+def read_all_tasks():
+    #(Wave 2: Query param: sort)
+    if "sort"in request.args or "SORT" in request.args:
+        sort_query_val = request.args.get("sort") if "sort"in request.args else \
+            request.args.get("SORT") 
+
+        if sort_query_val.lower() == "asc":
+            tasks = Task.query.order_by(Task.title).all()
+
+        elif sort_query_val.lower() == "desc":
+            tasks = Task.query.order_by(Task.title.desc()).all() 
+            # Source: https://stackoverflow.com/questions/4186062/sqlalchemy-order-by-descending
+
+        else:
+            return jsonify({"msg": f"Invalid query value: {sort_query_val}"}), 400
+
+    else:
+        tasks = Task.query.all()
+
+    tasks_response = [task.to_dict() for task in tasks]
+
+    # for task in tasks:
+    #     tasks_response.append(task.to_dict())
+
+    return jsonify(tasks_response), 200
+
+@tasks_bp.route("<task_id>", methods=["GET"])
+def read_task_by_id(task_id): 
+    task = validate_model(Task, task_id)
+    if task.goal_id is None:
+        return jsonify({"task":task.to_dict()}), 200
+    return jsonify({"task":task.to_dict_incl_goal_id()}), 200
+
+#Helper function for use in READ route: read_task_by_id and UPDATE route: update_task
+def validate_model(cls, id):
+    try:
+        model_id = int(id)
+    except:
+        abort(make_response(jsonify({"msg":f"invalid id: {model_id}"}), 400))
+    
+    chosen_object = cls.query.get(model_id)
+
+    if not chosen_object:
+        abort(make_response(jsonify({"msg": f"No {cls.__name__.lower()} found with given id: {model_id}"}), 404))
+
+    return chosen_object
+
+#UPDATE Routes (Wave 1: CRUD Routes)
+@tasks_bp.route("/<task_id>", methods=["PUT"])
+def update_task(task_id):
+
+    task = validate_model(Task, task_id)
+    request_body = request.get_json()
+    
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    
+    if len(request_body) > 2 and request_body["completed_at"]:
+        task.completed_at = request_body["completed_at"]
+
+    db.session.commit()
+
+    return jsonify({"task": {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": False if task.completed_at is None else True
+        }}), 200
+        
+#UPDATE Routes (Wave 3: PATCH Routes)
+@tasks_bp.route("/<task_id>/<mark>", methods=["PATCH"])
+def update_task_mark_complete_or_incomplete(task_id, mark):
+    task = validate_model(Task, task_id)
+    
+    if mark == "mark_complete":
+        task.completed_at = datetime.utcnow().date()
+        #Source: https://stackoverflow.com/questions/27587127/how-to-convert-datetime-date-today-to-utc-time
+        
+        
+        channel = "text-notifications"
+        message = f"Someone just completed the task {task.title}"
+        access_token = SLACK_TOKEN
+        my_headers = {'Authorization' : f'Bearer {access_token}'}
+        
+        #Method 1:
+        response = requests.post(f'https://slack.com/api/chat.postMessage', 
+            data={"channel": channel,"text": message},
+            headers=my_headers,json=True)
+        
+        #Alternate Method 2:
+        #response = requests.post(f'https://slack.com/api/chat.postMessage?channel={channel}&text={message}&pretty=1', headers=my_headers)
+        #Source: https://www.nylas.com/blog/use-python-requests-module-rest-apis/
+        
+        #Alternate Method 3: 
+        # channel_id = "C04A2GQ53NF" 
+        # send_message(channel_id=channel_id, message=message)
+        #Source: https://realpython.com/getting-started-with-the-slack-api-using-python-and-flask/
+    
+    elif mark == "mark_incomplete":
+        task.completed_at = None
+    
+    db.session.commit()
+
+    return jsonify({"task":task.to_dict()}), 200
+
+# DELETE Routes (Wave 1: CRUD Routes)
+@tasks_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):
+    task = validate_model(Task, task_id)
+    
+    db.session.delete(task)
+    db.session.commit()
+    
+    return jsonify({"details": f'Task {task_id} "{task.title}" successfully deleted'}), 200
+
+#Helper Function to call slack api (Alternate Method 3)
+# def send_message(channel_id, message):
+#     slack_client.api_call(
+#         "chat.postMessage",
+#         channel=channel_id,
+#         text=message,
+#     )
+#Source: https://api.slack.com/methods/chat.postMessage/code
+
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/af5b9f6159e5_.py b/migrations/versions/af5b9f6159e5_.py
new file mode 100644
index 000000000..7d36afa16
--- /dev/null
+++ b/migrations/versions/af5b9f6159e5_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: af5b9f6159e5
+Revises: 
+Create Date: 2022-11-04 15:39:06.854791
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'af5b9f6159e5'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('goal_id', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('task',
+    sa.Column('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')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/af5e2653f654_.py b/migrations/versions/af5e2653f654_.py
new file mode 100644
index 000000000..c8cdd3e81
--- /dev/null
+++ b/migrations/versions/af5e2653f654_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: af5e2653f654
+Revises: af5b9f6159e5
+Create Date: 2022-11-09 13:32:39.893322
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'af5e2653f654'
+down_revision = 'af5b9f6159e5'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('title', sa.String(), nullable=True))
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'task', type_='foreignkey')
+    op.drop_column('task', 'goal_id')
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index cacdbc36e..ad6b2cbf2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,6 +28,7 @@ python-dotenv==0.15.0
 python-editor==1.0.4
 requests==2.25.1
 six==1.15.0
+slack_sdk==3.19.3
 SQLAlchemy==1.3.23
 toml==0.10.2
 urllib3==1.26.5
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..d9b42489b 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,13 @@ 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 == {"msg": "No task found with given id: 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_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +93,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 +119,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 +131,14 @@ def test_update_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 == {"msg": "No task found with given id: 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_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
@@ -152,7 +153,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 +162,15 @@ 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 response_body == {"msg": "No task found with given id: 1"}
     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 +187,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..0159faf3f 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")
@@ -27,9 +27,85 @@ def test_get_tasks_sorted_asc(client, three_tasks):
             "description": "",
             "is_complete": False}
     ]
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_asc_ignore_case_SORT(client, three_tasks):
+    # Act
+    response = client.get("/tasks?SORT=asc")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "id": 2,
+            "title": "Answer forgotten email 📧",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 3,
+            "title": "Pay my outstanding tickets 😭",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 1,
+            "title": "Water the garden 🌷",
+            "description": "",
+            "is_complete": False}
+    ]
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_asc_ignore_case_ASC(client, three_tasks):
+    # Act
+    response = client.get("/tasks?sort=ASC")
+    response_body = response.get_json()
 
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "id": 2,
+            "title": "Answer forgotten email 📧",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 3,
+            "title": "Pay my outstanding tickets 😭",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 1,
+            "title": "Water the garden 🌷",
+            "description": "",
+            "is_complete": False}
+    ]
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_asc_ignore_case_SORT_ASC(client, three_tasks):
+    # Act
+    response = client.get("/tasks?SORT=ASC")
+    response_body = response.get_json()
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "id": 2,
+            "title": "Answer forgotten email 📧",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 3,
+            "title": "Pay my outstanding tickets 😭",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 1,
+            "title": "Water the garden 🌷",
+            "description": "",
+            "is_complete": False}
+    ]
+#@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")
@@ -55,3 +131,82 @@ def test_get_tasks_sorted_desc(client, three_tasks):
             "is_complete": False,
             "title": "Answer forgotten email 📧"},
     ]
+
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_desc_ignore_case_SORT(client, three_tasks):
+    # Act
+    response = client.get("/tasks?SORT=desc")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "description": "",
+            "id": 1,
+            "is_complete": False,
+            "title": "Water the garden 🌷"},
+        {
+            "description": "",
+            "id": 3,
+            "is_complete": False,
+            "title": "Pay my outstanding tickets 😭"},
+        {
+            "description": "",
+            "id": 2,
+            "is_complete": False,
+            "title": "Answer forgotten email 📧"},
+    ]
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_desc_ignore_case_DESC(client, three_tasks):
+    # Act
+    response = client.get("/tasks?sort=DESC")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "description": "",
+            "id": 1,
+            "is_complete": False,
+            "title": "Water the garden 🌷"},
+        {
+            "description": "",
+            "id": 3,
+            "is_complete": False,
+            "title": "Pay my outstanding tickets 😭"},
+        {
+            "description": "",
+            "id": 2,
+            "is_complete": False,
+            "title": "Answer forgotten email 📧"},
+    ]
+#@pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_tasks_sorted_desc_ignore_case_SORT_DESC(client, three_tasks):
+    # Act
+    response = client.get("/tasks?SORT=DESC")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "description": "",
+            "id": 1,
+            "is_complete": False,
+            "title": "Water the garden 🌷"},
+        {
+            "description": "",
+            "id": 3,
+            "is_complete": False,
+            "title": "Pay my outstanding tickets 😭"},
+        {
+            "description": "",
+            "id": 2,
+            "is_complete": False,
+            "title": "Answer forgotten email 📧"},
+    ]
\ No newline at end of file
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 32d379822..50be0acc6 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
     """
@@ -23,8 +23,8 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 
-        # Act
-        response = client.patch("/tasks/1/mark_complete")
+    # Act
+    response = client.patch("/tasks/1/mark_complete")
     response_body = response.get_json()
 
     # Assert
@@ -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
     """
@@ -80,8 +80,8 @@ def test_mark_complete_on_completed_task(client, completed_task):
     with patch("requests.post") as mock_get:
         mock_get.return_value.status_code = 200
 
-        # Act
-        response = client.patch("/tasks/1/mark_complete")
+    # Act
+    response = client.patch("/tasks/1/mark_complete")
     response_body = response.get_json()
 
     # Assert
@@ -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")
@@ -128,13 +128,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 == {"msg": "No task found with given id: 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_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -143,7 +143,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 == {"msg": "No task found with given id: 1"}
\ No newline at end of file
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..ed50388f5 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,24 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+#@pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
     pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
+    #raise Exception("Complete test")
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert response_body == {"msg": "No goal found with given id: 1"}
     # ---- 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 +83,52 @@ 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": "Do a random act of kindness."
+    })
+    response_body = response.get_json()
+    
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 200
     # assertion 2 goes here
+    assert "msg" in response_body
     # assertion 3 goes here
+    assert response_body=={
+        "msg": "Successfully updated goal with id 1"
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "Do a random act of kindness."
+    assert goal.goal_id == 1
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+#@pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
+    #raise Exception("Complete test")
     # Act
     # ---- Complete Act Here ----
-
+    response = client.put("/goals/1", json={
+        "title": "Do a random act of kindness."
+    })
+    response_body = response.get_json()
     # Assert
     # ---- Complete Assertions Here ----
     # assertion 1 goes here
+    assert response.status_code == 404
     # assertion 2 goes here
+    assert response_body == {"msg": "No goal found with given id: 1"}
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
@@ -124,27 +145,31 @@ 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***************
     # *****************************************************************
+    assert response.get_json() == {"msg": "No goal found with given id: 1"}
 
-
-@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
+    assert "msg" in response_body
     # assertion 2 goes here
+    assert response_body == {"msg": "No goal found with given id: 1"}
     # ---- Complete Assertions Here ----
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+#@pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 8afa4325e..5957a4a6f 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={
@@ -16,14 +16,13 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert "task_ids" in response_body
     assert response_body == {
         "id": 1,
-        "task_ids": [1, 2, 3]
-    }
+        "task_ids": [1, 2, 3]    }
 
     # Check that Goal was updated in the db
     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 +41,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 +50,14 @@ def test_get_tasks_for_specific_goal_no_goal(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    #raise Exception("Complete test with assertion about response body")
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
+    assert "msg" in response_body
+    assert response_body == {"msg": "No goal found with given id: 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_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()