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..7d2b3fe0b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,5 +30,8 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
-
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..5b0386d74 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,6 +1,24 @@
 from flask import current_app
+from sqlalchemy.orm import backref
 from app import db
+from .task import Task
 
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship("Task", backref="goal", lazy=True, uselist=True)
+
+    def to_dict(self):  
+        return {
+            "id": self.goal_id, 
+            "title": self.title,
+        }
+        
+    def task_list(self):
+        task_list = []
+
+        for task in self.tasks:
+            task_list.append(task.to_dict())
+
+        return task_list
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..501e83353 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,25 @@
-from flask import current_app
+from flask import current_app, jsonify
 from app import db
-
+import requests
+import os
+#from app.models.goal import Goal
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable =True)
+    is_complete = db.Column(db.Boolean)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+
+    def to_dict(self):  
+        task_dict = {
+            "id": self.task_id, 
+            "title": self.title,
+            "description": self.description,
+            "is_complete": self.completed_at is not None,
+        }
+        if self.goal_id:
+            task_dict["goal_id"] = self.goal_id
+        
+        return task_dict
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..913923c8a 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,231 @@
-from flask import Blueprint
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from flask import Blueprint, jsonify, request, abort, make_response
+from datetime import datetime, timezone
+import os
+from dotenv import load_dotenv
+import requests
 
+tasks_bp = Blueprint("task_list", __name__, url_prefix="/tasks")
+
+def valid_int(number, parameter_type):
+    try:
+        int(number)
+    except:
+        abort(make_response({"error": f"{parameter_type} must be an int"})), 400
+
+def get_task_from_id(task_id):
+    valid_int(task_id, "task_id")
+    return Task.query.get_or_404(task_id, description="{task not found}")
+
+@tasks_bp.route("", methods=["POST"])
+def post_new_task():
+    
+    request_body = request.get_json()
+    if "title" not in request_body or "description" not in request_body\
+         or "completed_at" not in request_body:
+        return jsonify({"details": "Invalid data"}), 400
+
+    new_task = Task(title=request_body["title"],
+    description=request_body["description"],
+    completed_at=request_body["completed_at"])
+   
+    db.session.add(new_task)
+    db.session.commit()
+
+    response_body = {
+        "task": (new_task.to_dict())
+    }
+    return jsonify(response_body), 201
+
+@tasks_bp.route("/<task_id>", methods=["GET"])
+def getting_one_task(task_id):
+    task = Task.query.get(task_id)
+
+    if task is None:
+        return jsonify(None), 404
+    
+    response_body = {
+        "task": (task.to_dict())
+    }
+    return jsonify(response_body), 200
+
+@tasks_bp.route("", methods=["GET"])
+def getting_tasks():
+    query = Task.query # Base query
+
+    # Query params, adding to query where indicated
+    sort = request.args.get("sort")
+    if sort == "asc":
+        query = query.order_by(Task.title)
+    elif sort == "desc":
+        query = query.order_by(Task.title.desc())
+    
+    query = query.all() # Final query
+    
+    # Returns jsonified list of task dicionaries
+    return jsonify([task.to_dict() for task in query])  
+
+@tasks_bp.route("/<task_id>", methods=["PUT"])
+def put_task(task_id):
+    task = Task.query.get(task_id)
+    if task is None:
+        return jsonify(None), 404
+
+    request_body = request.get_json()
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+
+    db.session.commit()
+
+    response_body = {
+        "task": (task.to_dict())
+    }
+    return jsonify(response_body), 200
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"])
+def delete_task(task_id):    
+    task = Task.query.get(task_id)
+    if task is None:
+        return jsonify(None), 404
+    
+    db.session.delete(task)
+    db.session.commit()
+    return jsonify({
+        'details': f'Task {task.task_id} "{task.title}" successfully deleted'
+        }), 200
+
+# Wave 3/new endpoints updates task as complete
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
+def update_task_completion(task_id):
+    task= get_task_from_id(task_id)
+    task.is_complete=True
+    task.completed_at = datetime.now()
+    db.session.commit()
+    
+    slack_key = os.environ.get("SLACK_KEY")
+    slack_url = os.environ.get("SLACK_URL")
+    channel_id = os.environ.get("CHANNEL_ID")
+    requests.post(slack_url, headers= {'Authorization': f"Bearer {slack_key}"}, \
+        data= {'channel' : f"{channel_id}", 'text' : f"Someone just completed the task My Beautiful Task"})
+    return jsonify({"task": task.to_dict()}), 200
+
+# route that will mark item as incomplete
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def update_task_incomplete(task_id):
+    task= get_task_from_id(task_id)
+    
+    task.is_complete=False
+    task.completed_at=None
+    # db.session.add(task)
+    db.session.commit()
+    return jsonify({"task": task.to_dict()}), 200 
+
+##########GOAL_ROUTES############
+#################################
+
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")    
+
+@goals_bp.route("", methods=["POST"]) #my decorator
+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["title"]
+    )
+    
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return {"goal": new_goal.to_dict()}, 201
+    
+@goals_bp.route("", methods=["GET"])
+def get_one_goal():
+    goals = Goal.query.all()
+    
+    goal_list = []
+
+    if not goals:
+        return jsonify(goal_list), 200
+    
+    for goal in goals:
+        goal_list.append(goal.to_dict())
+    
+    return jsonify(goal_list), 200
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"])
+def read_tasks_for_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        return "", 404
+
+    return {
+        "id": goal.goal_id,
+        "title": goal.title,
+        "tasks": goal.task_list()
+    }, 200
+
+@goals_bp.route("/<goal_id>", methods=["GET"])
+def get_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return jsonify(None), 404
+    
+    response_body = {
+        "goal": (goal.to_dict())
+    }
+    
+    return jsonify(response_body), 200
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"])
+def create_tasks_for_goal(goal_id):
+    request_body = request.get_json()
+
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        return "", 404
+
+    for id in request_body['task_ids']:
+        goal.tasks.append(Task.query.get(id))
+
+    db.session.commit()
+
+    return {
+        "id": goal.goal_id,
+        "task_ids": request_body['task_ids']
+    }, 200
+
+@goals_bp.route("/<goal_id>", methods=["PUT", "PATCH"])
+def update_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        return "", 404
+
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    return {"goal": goal.to_dict()}, 200
+
+@goals_bp.route("/<goal_id>", methods=["DELETE"])
+def delete_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+
+    if not goal:
+        return "", 404
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return {"details":
+            f'Goal {goal.goal_id} "{goal.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/2c60e034b676_.py b/migrations/versions/2c60e034b676_.py
new file mode 100644
index 000000000..9356e832b
--- /dev/null
+++ b/migrations/versions/2c60e034b676_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 2c60e034b676
+Revises: 800c8fa4b4d6
+Create Date: 2021-11-04 11:17:13.176980
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '2c60e034b676'
+down_revision = '800c8fa4b4d6'
+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('is_complete', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'is_complete')
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/2ed49f400a90_.py b/migrations/versions/2ed49f400a90_.py
new file mode 100644
index 000000000..156ac90cb
--- /dev/null
+++ b/migrations/versions/2ed49f400a90_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 2ed49f400a90
+Revises: 2c60e034b676
+Create Date: 2021-11-18 22:05:48.201474
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '2ed49f400a90'
+down_revision = '2c60e034b676'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['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')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/800c8fa4b4d6_.py b/migrations/versions/800c8fa4b4d6_.py
new file mode 100644
index 000000000..c5a52b320
--- /dev/null
+++ b/migrations/versions/800c8fa4b4d6_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 800c8fa4b4d6
+Revises: 
+Create Date: 2021-11-01 18:06:55.668679
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '800c8fa4b4d6'
+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('task_id', sa.Integer(), 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('task_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index 6ba60c6fa..f713e9bb6 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,4 +1,5 @@
 import pytest
+from app.models.goal import Goal
 
 def test_get_goals_no_saved_goals(client):
     # Act
@@ -41,18 +42,15 @@ 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()
-
     # Assert
     # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+    assert response.status_code == 404 
+    assert response_body == None
 
 def test_create_goal(client):
     # Act
@@ -71,30 +69,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):
-    pass
+    
     # Act
-    # ---- Complete Act Here ----
-
+    response = client.put("/goals/1", json ={
+        "title": "Updated Goal Title"
+    })
+    response_body = response.get_json()
+    
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
+    assert response.status_code == 200
+    assert "goal" in response_body
+    assert response_body == {
+        "goal": {
+            "id": 1, 
+            "title": "Updated Goal Title"
+        }
+    }
+    goal = Goal.query.get(1)
+    assert goal.title == "Updated Goal Title"
     # ---- 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):
     pass
     # Act
-    # ---- Complete Act Here ----
+    response = client.get("/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 == None
+
 
 
 def test_delete_goal(client, one_goal):
@@ -113,18 +120,15 @@ def test_delete_goal(client, one_goal):
     response = client.get("/goals/1")
     assert response.status_code == 404
 
-@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):
-    pass
-
     # Act
-    # ---- Complete Act Here ----
+    response = client.get("/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 == None
 
 
 def test_create_goal_missing_title(client):