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..2878f5af8 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,8 +1,10 @@
+
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-import os
 from dotenv import load_dotenv
+import os
+from flask_cors import CORS
 
 
 db = SQLAlchemy()
@@ -12,6 +14,10 @@
 
 def create_app(test_config=None):
     app = Flask(__name__)
+ 
+    app.config['CORS_HEADERS'] = 'Content-Type'
+
+    
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
     if test_config is None:
@@ -22,13 +28,23 @@ def create_app(test_config=None):
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_TEST_DATABASE_URI")
 
+    # db.init_app(app)
+    # migrate.init_app(app, db)        
+
     # Import models here for Alembic setup
     from app.models.task import Task
     from app.models.goal import Goal
 
     db.init_app(app)
-    migrate.init_app(app, db)
+    migrate.init_app(app, db)  
+    
+    from .routes import task_bp, goal_bp
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goal_bp)
+    # app.register_blueprint(main_bp)
 
-    # Register Blueprints here
 
+
+    # Register Blueprints here
+    CORS(app)
     return app
diff --git a/app/helper_routes.py b/app/helper_routes.py
new file mode 100644
index 000000000..ba10f64bd
--- /dev/null
+++ b/app/helper_routes.py
@@ -0,0 +1,12 @@
+
+
+from flask import jsonify, abort, make_response
+
+def error_message(message, status_code):
+    abort(make_response(jsonify(dict(details=message)), status_code))
+
+
+
+
+# validate record
+# pass in the actual class in our function, to use for both models ! 
\ No newline at end of file
diff --git a/app/models/goal.py b/app/models/goal.py
index b0ed11dd8..f84feba3e 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -2,4 +2,18 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String, nullable=False)
+    tasks = db.relationship('Task', backref='goal', lazy=True)
+
+
+    def to_dict(self):
+            return dict(
+                id=self.id,
+                title=self.title)
+                
+
+
+
+## ONE TO MANY RELATIONSHIP
+# GOALS HAVE MANY TASKS
diff --git a/app/models/task.py b/app/models/task.py
index c91ab281f..2fbf87584 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,72 @@
 from app import db
 
-
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    is_complete = db.Column(db.Boolean, default=False)
+    completed_at = db.Column(db.DateTime, default=None)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'))
+    # goal = db.relationship ("Goal", backref='tasks')
+
+
+
+    def to_dict(self):
+        task_dict = dict(
+            # goal_id=self.goal_id
+            id=self.id,
+            title=self.title,
+            description=self.description,
+            is_complete= self.is_complete
+        )
+
+        # True if self.completed_at else False
+
+        if self.completed_at:
+            task_dict['is_complete'] = True 
+
+        if self.goal_id: 
+            task_dict['goal_id'] = self.goal_id
+
+        return task_dict
+        
+        
+
+  
+    @classmethod
+    def from_dict(cls, data_dict):
+        
+        return cls(
+            title=data_dict["title"],
+            description=data_dict["description"]
+            # is_complete=data_dict["is_complete"],
+            # completed_at=data_dict["completed_at"]
+            # is_complete=data_dict["is_complete"],
+            
+        )
+
+    def replace_details(self, data_dict):
+        self.title=data_dict["title"]
+        self.description=data_dict["description"]
+        
+        if "completed_at" in data_dict: 
+            self.completed_at=data_dict["completed_at"]
+            self.is_complete= True 
+        
+        return self.to_dict()
+
+
+
+    # completed_at : default null (none)
+
+    # is_complete(db.relationship)
+
+
+    # when we care a new task, completed_att should be NULL (NONE)
+
+
+
+
+
+
+
diff --git a/app/routes.py b/app/routes.py
index 3aae38d49..5c7669575 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1 +1,270 @@
-from flask import Blueprint
\ No newline at end of file
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from flask import Blueprint, jsonify, make_response, request, abort, Response
+from app.helper_routes import error_message
+import os 
+from datetime import datetime
+import requests
+
+
+
+
+task_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goal_bp = Blueprint("goals", __name__, url_prefix="/goals")
+# main_bp = Blueprint("/", __name__)
+
+# @main_bp.route("", method=["GET"])
+# def main_page(): 
+#     return ("Welcome to task-list -- A space to track tasks and goals")
+
+
+
+@goal_bp.route("", methods=["GET"])
+def get_all_goals():
+    goals = Goal.query.all()
+    response_body = [goal.to_dict() for goal in goals]
+    return jsonify(response_body)
+    
+
+
+@task_bp.route("", methods=["GET"])
+def get_all_tasks():
+    sort_tasks = request.args.get('sort')
+  
+    if not sort_tasks: 
+        tasks = Task.query.all()
+    elif sort_tasks == "asc": 
+        tasks = Task.query.order_by(Task.title.asc()).all()
+    elif sort_tasks == "desc": 
+        tasks = Task.query.order_by(Task.title.desc()).all()
+    else: 
+        tasks = Task.query.all()
+
+    response_body = [task.to_dict() for task in tasks]
+    return jsonify(response_body)
+
+@goal_bp.route("/<id>/tasks", methods=["GET"])
+def get_tasks_for_goal(id):
+    goal = validate_goal(id)
+
+    task_of_goal = []
+
+    goal_with_tasks = {"id": goal.id,
+    "title": goal.title,
+    "tasks": task_of_goal}
+
+    
+    for task in goal.tasks: 
+        task = validate_task(id)
+        task_of_goal.append(task.to_dict())
+
+    return goal_with_tasks
+
+
+def validate_task(id):
+	try:
+		id = int(id)
+	except ValueError:
+		error_message(f"Invalid id {id}", 400)
+
+	task = Task.query.get(id)
+		
+	if task:
+		return task
+	error_message(f'task with id #{id} not found', 404)
+
+def validate_goal(id):
+	try:
+		id = int(id)
+	except ValueError:
+		error_message(f"Invalid id {id}", 400)
+
+	goal = Goal.query.get(id)
+		
+	if goal:
+		return goal
+	error_message(f'Goal with id #{id} not found', 404)
+
+def make_task_safely(data_dict):
+    return Task.from_dict(data_dict)
+
+
+@goal_bp.route("", methods=["POST"]) 
+def create_goal(): 
+    request_body= request.get_json() 
+
+    if "title" not in request_body:
+        return {'details': 'Invalid data'}, 400
+
+    new_goal = Goal(
+        title = request_body.get("title"))
+        
+    db.session.add(new_goal)
+    db.session.commit()
+    return {"goal": new_goal.to_dict()}, 201  
+
+
+@task_bp.route("", methods=["POST"])
+def create_task():  
+    request_body = request.get_json() 
+    
+
+    # return request_body  
+    if "title" not in request_body or "description" not in request_body:
+        return {'details': 'Invalid data'}, 400
+
+    new_task = Task(
+        title = request_body.get("title"),
+        description = request_body.get("description"),
+        completed_at = request_body.get("completed_at")      
+        ) 
+        
+    db.session.add(new_task)
+    db.session.commit()
+    return {"task": new_task.to_dict()}, 201 
+
+
+@task_bp.route("/<id>", methods=["GET"])
+def get_task(id):
+    task = validate_task(id)
+    response_body = {"task": task.to_dict()}
+    return response_body 
+
+@goal_bp.route("/<id>", methods=["GET"]) 
+def get_goal(id):
+    goal = validate_goal(id)
+    return {"goal": goal.to_dict()}
+
+
+
+def replace_task_safely(task, data_dict):
+    return task.replace_details(data_dict)
+
+
+
+@task_bp.route("/<id>", methods=["PUT"])
+def update_task_by_id(id):
+    request_body = request.get_json()
+    task = validate_task(id)
+    
+    replace_task_safely(task, request_body)
+    db.session.add(task)
+    db.session.commit()
+    return {"task": task.to_dict()}
+
+@goal_bp.route("/<id>", methods=["PUT"])
+def update_goal_by_id(id):
+    goal = validate_goal(id)
+    request_body = request.get_json()
+
+    goal.title = request_body['title']
+    
+    db.session.add(goal)
+    db.session.commit()
+    return {"goal": goal.to_dict()}
+    
+@goal_bp.route("/<id>/tasks", methods=["POST"])
+def tasks_of_goal(id): 
+    goal = validate_goal(id)
+    request_body = request.get_json()
+
+    for id in request_body['task_ids']: 
+        new_task = validate_task(id)
+        goal.tasks.append(new_task)
+
+    db.session.commit()
+    return {"id": goal.id, 
+    "task_ids" : request_body['task_ids']}
+
+# slack_bot_token= os.environ.put('SLACK_BOT_TOKEN')
+# channel_name = 'test-channel'
+# text=f"Someone just completed the task a task"
+# headers = {"Authorization": slack_bot_token}
+# slack_url = f'https://slack.com/api/chat.postMessage?channel={channel_name}&text={text}' 
+
+
+
+
+        
+@task_bp.route("/<id>/mark_complete", methods=["PATCH"])
+def mark_complete(id):
+    task = validate_task(id)
+    # task.is_complete = True 
+    task.completed_at = datetime.utcnow()
+
+    
+    db.session.add(task)
+    db.session.commit()
+
+
+
+    # slack_bot_token= os.environ.get('SLACK_BOT_TOKEN')
+    # channel_name = 'test-channel'
+    # text=f"Someone just completed {task.title}"
+    # headers = {"Authorization": slack_bot_token}
+    # slack_url = f'https://slack.com/api/chat.postMessage?channel={channel_name}&text={text}' 
+    
+    ## UNCOMMENT RESPONSE TO POST
+    #response = requests.post(slack_url, headers=headers)
+
+    
+
+    return {"task": task.to_dict()}
+
+@task_bp.route("/<id>/mark_incomplete", methods=["PATCH"])
+def mark_incomplete(id):
+    task = validate_task(id)
+   
+    task.completed_at = None
+
+    db.session.add(task)
+    db.session.commit()
+
+    # slack_bot_token= os.environ.get('SLACK_BOT_TOKEN')
+    # channel_name = 'test-channel'
+    # text=f"Someone still hasn't completed {task.title}"
+    # headers = {"Authorization": slack_bot_token}
+    # slack_url = f'https://slack.com/api/chat.postMessage?channel={channel_name}&text={text}' 
+    
+   # response = requests.post(slack_url, headers=headers)
+
+    return {"task": task.to_dict()}
+
+
+@task_bp.route("/<id>", methods=["DELETE"])
+def delete_task(id): 
+    task = validate_task(id)
+
+    response_body = {"details": f'Task {task.id} "{task.title}" successfully deleted'}
+
+    db.session.delete(task)
+    db.session.commit()
+    return response_body
+
+
+
+@goal_bp.route("/<id>", methods=["DELETE"])
+def delete_goal(id): 
+    goal = validate_goal(id)
+
+    response_body = {"details": f'Goal {goal.id} "{goal.title}" successfully deleted'}
+
+    db.session.delete(goal)
+    db.session.commit()
+    return response_body
+
+
+
+
+
+
+     
+
+  
+
+
+  
+
+
+
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/90e88909c11f_.py b/migrations/versions/90e88909c11f_.py
new file mode 100644
index 000000000..2fefacec6
--- /dev/null
+++ b/migrations/versions/90e88909c11f_.py
@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: 90e88909c11f
+Revises: 
+Create Date: 2022-05-13 14:14:51.694797
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '90e88909c11f'
+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=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('task',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('is_complete', sa.Boolean(), 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/requirements.txt b/requirements.txt
index 30ff414fe..8f97165f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,9 +5,17 @@ blinker==1.4
 certifi==2020.12.5
 chardet==4.0.0
 click==7.1.2
+colorama==0.4.5
+cors==1.0.1
+coverage==6.3.2
+filelock==3.7.1
 Flask==1.1.2
+Flask-Cors==3.0.10
 Flask-Migrate==2.6.0
 Flask-SQLAlchemy==2.4.4
+future==0.18.2
+gevent==21.12.0
+greenlet==1.1.2
 gunicorn==20.1.0
 idna==2.10
 iniconfig==1.1.1
@@ -21,14 +29,19 @@ psycopg2-binary==2.8.6
 py==1.10.0
 pycodestyle==2.6.0
 pyparsing==2.4.7
+PySocks==1.7.1
 pytest==6.2.3
 pytest-cov==2.12.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-editor==1.0.4
 requests==2.25.1
+requests-file==1.5.1
 six==1.15.0
 SQLAlchemy==1.3.23
+tldextract==3.3.0
 toml==0.10.2
 urllib3==1.26.5
 Werkzeug==1.0.1
+zope.event==4.5.0
+zope.interface==5.4.0
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index dca626d78..f4e0a8cc1 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")
+    assert response_body == {'details': 'task with id #1 not found'}
+
+
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -93,7 +95,7 @@ def test_create_task(client):
     assert new_task.completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task(client, one_task):
     # Act
     response = client.put("/tasks/1", json={
@@ -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,13 @@ def test_update_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"details": "task with id #1 not found"}
     # *****************************************************************
     # **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 +154,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,7 +163,7 @@ def test_delete_task_not_found(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"details": "task with id #1 not found"}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -169,7 +171,7 @@ def test_delete_task_not_found(client):
     assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -186,7 +188,7 @@ def test_create_task_must_contain_title(client):
     assert Task.query.all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_description(client):
     # Act
     response = client.post("/tasks", json={
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index a087e0909..651e3aebd 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_asc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=asc")
@@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_desc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=desc")
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index 959176ceb..e1f6d1580 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")
@@ -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")
+    assert response_body == {"details": "task with id #1 not found"}
     # *****************************************************************
     # **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")
@@ -143,7 +143,7 @@ def test_mark_incomplete_missing_task(client):
     # Assert
     assert response.status_code == 404
 
-    raise Exception("Complete test with assertion about response body")
+    assert response_body == {"details": "task with id #1 not found"}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
@@ -151,7 +151,7 @@ def test_mark_incomplete_missing_task(client):
 
 # Let's add this test for creating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_with_valid_completed_at(client):
     # Act
     response = client.post("/tasks", json={
@@ -181,7 +181,7 @@ def test_create_task_with_valid_completed_at(client):
 
 # Let's add this test for updating tasks, now that
 # the completion functionality has been implemented
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_with_completed_at_date(client, completed_task):
     # Act
     response = client.put("/tasks/1", json={
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index aee7c52a1..c741a8d3e 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
 import pytest
+from app.models.goal import Goal 
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -29,8 +30,8 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
-def test_get_goal(client, one_goal):
+# @pytest.mark.skip(reason="No way to test this feature yet")
+def test_get_goal_not_found(client, one_goal):
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
@@ -46,14 +47,14 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
-def test_get_goal_not_found(client):
-    pass
+# @pytest.mark.skip(reason="test to be completed by student")
+def test_get_goal_none_found(client):  
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
+    assert response.status_code == 404
+    assert response_body == {'details': 'Goal with id #1 not found'}
     # Assert
     # ---- Complete Test ----
     # assertion 1 goes here
@@ -61,7 +62,7 @@ def test_get_goal_not_found(client):
     # ---- 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,23 +81,39 @@ 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
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "New Year, New 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 ----
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body == {
+        "goal": {
+            "id": 1,
+            "title": "New Year, New Goal"
+        }
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "New Year, New 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")
+    response = client.put("/goals/1", json={
+        "title": "Read Every Book"
+    })
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 404
+
+    assert response_body == {"details": "Goal with id #1 not found"}
+
+    
     # Act
     # ---- Complete Act Here ----
 
@@ -107,7 +124,7 @@ def test_update_goal_not_found(client):
     # ---- 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")
@@ -119,32 +136,34 @@ def test_delete_goal(client, one_goal):
     assert response_body == {
         "details": 'Goal 1 "Build a habit of going outside daily" successfully deleted'
     }
+    assert Goal.query.get(1) == None
 
     # Check that the goal was deleted
     response = client.get("/goals/1")
     assert response.status_code == 404
+    assert Goal.query.get(1) == None
 
-    raise Exception("Complete test with assertion about response body")
+    
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
 
-    # 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 == {"details": "Goal with id #1 not found"}
+    assert Goal.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_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..49817d232 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")
+    assert response_body == {'details': 'Goal with id #1 not found'}
     # *****************************************************************
     # **Complete test with assertion about response body***************
     # *****************************************************************
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -74,7 +74,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -99,7 +99,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     response = client.get("/tasks/1")
     response_body = response.get_json()