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..6b316b065 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -28,7 +28,15 @@ def create_app(test_config=None):
 
     db.init_app(app)
     migrate.init_app(app, db)
+    
+    from app.models.task import Task
+    from app.models.goal import Goal
 
     # 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..d6e0784b4 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,6 +1,10 @@
 from flask import current_app
 from app import db
+from sqlalchemy import ForeignKey, update
+from sqlalchemy.orm import relationship
 
 
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship('Task', backref='tasks', lazy=True)
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..33659f109 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,13 @@
 from flask import current_app
 from app import db
+from sqlalchemy.orm import relationship
+from sqlalchemy import ForeignKey, update
 
 
 class Task(db.Model):
     task_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.VARCHAR(50))
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True, default=None)
+    is_complete = db.Column(db.Boolean, default=False)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..e3ad39297 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,261 @@
-from flask import Blueprint
+from app import db
+from app.models.task import Task
+from app.models.goal import Goal
+from flask import request, Blueprint, make_response, jsonify
+from datetime import datetime
+import os
+import json, requests
+from dotenv import load_dotenv
 
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+load_dotenv()
+
+def post_message_to_slack(text):
+    SLACK_TOKEN = os.environ.get('SLACKBOT_TOKEN')
+    slack_path = "https://slack.com/api/chat.postMessage"
+    query_params ={
+        'channel': 'task-notifications',
+        'text': text  
+    }
+    headers = {'Authorization': f"Bearer {SLACK_TOKEN}"}
+    requests.post(slack_path, params=query_params, headers=headers)
+    
+@goals_bp.route("", methods=["GET", "POST"])
+def handle_goals():
+    if request.method == "GET":
+        goals = Goal.query.all()
+        goal_response = []
+        for goal in goals:
+            goal_response.append({
+                "title": goal.title,
+                "id": goal.goal_id
+            })
+        return jsonify(goal_response), 200
+    
+    elif request.method == "POST":
+        request_body = request.get_json()
+        title = request_body.get("title")
+        if not title:
+            return jsonify({"details": "Invalid data"}), 400
+        
+        new_goal = Goal(title=request_body["title"])
+        db.session.add(new_goal)
+        db.session.commit()
+        
+        commited_goal = {"goal":
+            {"id": new_goal.goal_id,
+            "title": new_goal.title
+            }}
+        
+    return (commited_goal), 201
+
+@goals_bp.route("/<goal_id>", methods=["GET", "PUT", "DELETE"])
+def handle_goal(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+
+    if request.method == "GET":
+        selected_goal = {"goal":
+            {"id": goal.goal_id,
+            "title": goal.title
+            }
+        }
+        return selected_goal
+    
+    elif request.method == "PUT":
+        form_data = request.get_json()
+        
+        goal.title = form_data["title"]
+        
+        db.session.commit()
+        
+        commited_goal = {"goal":
+                        {"id": goal.goal_id,
+                        "title": goal.title
+                    }
+                    }
+        return jsonify(commited_goal), 200
+    
+    elif request.method == "DELETE":        
+        db.session.delete(goal)
+        db.session.commit()
+        return jsonify(
+        {f"details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'}
+    )
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET", "POST"])
+def handle_goal_tasks(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+    if request.method == "GET":
+        tasks = []
+        for task in goal.tasks:
+            single_task= {
+            "id": task.task_id,
+            "goal_id": goal.goal_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": bool(task.completed_at)
+        }
+            tasks.append(single_task)
+        return make_response ({
+            "id": goal.goal_id,
+            "title": goal.title,
+            "tasks": tasks
+        })
+    
+    if request.method == "POST":
+        goal.tasks =[]
+        
+        form_data = request.get_json()
+        task_ids = form_data['task_ids']
+
+        for t_id in task_ids:
+            task = Task.query.get_or_404(t_id)
+            goal.tasks.append(task)
+            
+        db.session.add(goal)    
+        db.session.commit()
+
+        response_task_ids = []
+        for task in goal.tasks:
+            response_task_ids.append(task.task_id)
+            
+        return {
+            "id": goal.goal_id,
+            "task_ids": response_task_ids
+        }
+
+@tasks_bp.route("", methods=["POST", "GET"])
+def handle_tasks():
+    if request.method == "GET":
+        title_query = request.args.get("title")
+        if title_query:
+            tasks = Task.query.filter(Task.title.ilike(f'%{title_query}%'))
+        else:
+            sort = request.args.get("sort")
+            if not sort:
+                tasks = Task.query.all()
+            elif sort == "asc":
+                tasks = Task.query.order_by(Task.title.asc()).all()
+            elif sort == "desc":
+                tasks = Task.query.order_by(Task.title.desc()).all()
+            else:
+                tasks = Task.query.all()
+            
+        tasks_response = []
+        for task in tasks:
+            tasks_response.append({
+                "description": task.description,
+                "is_complete": bool(task.completed_at),
+                "id": task.task_id,
+                "title": task.title
+            })
+        return jsonify(tasks_response)
+    
+    elif request.method == "POST":
+        request_body = request.get_json()
+        title = request_body.get("title")
+        description = request_body.get("description")
+        if not title or not description 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()
+        commited_task = {"task":
+            {"id": new_task.task_id,
+            "title": new_task.title,
+            "description": new_task.description,
+            "is_complete": bool(new_task.completed_at)}}
+        
+    return jsonify(commited_task), 201
+
+@tasks_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE"])
+def handle_task(task_id):
+    task = Task.query.get_or_404(task_id)
+
+    if request.method == "GET":
+        if task == None:
+            return make_response("No matching task found", 404)
+        if request.method == "GET":
+            if task.goal_id == None:  
+                selected_task = {"task":
+                {"task_id": task.task_id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.is_complete
+                }
+                }
+                return selected_task
+            else:
+                return make_response ({
+                    "task": {
+                    "id": task.task_id,
+                    "goal_id": task.goal_id,
+                    "title": task.title,
+                    "description": task.description,
+                    "is_complete": task.is_complete
+                    }
+                })
+        
+    elif request.method == "PUT":
+        form_data = request.get_json()
+        
+        task.title = form_data["title"]
+        task.description = form_data["description"]
+        task.completed_at = form_data["completed_at"]
+        
+        db.session.commit()
+        
+        commited_task = {"task": 
+                        {"id": task.task_id,
+                        "title": task.title,
+                        "description": task.description,
+                        "is_complete": bool(task.completed_at)
+                    }
+                    }
+        return jsonify(commited_task), 200
+    
+    elif request.method == "DELETE":        
+        db.session.delete(task)
+        db.session.commit()
+        return jsonify(
+        {f"details": 'Task 1 "Go on my daily walk 🏞" successfully deleted'}
+    )
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])    
+def mark_task_completed(task_id):
+    task = Task.query.get_or_404(task_id)            
+    task.completed_at = datetime.now()
+    
+    db.session.commit() 
+    slack_message = f"Someone just completed the task {task.title}"
+    post_message_to_slack(slack_message)
+
+    completed_task = {"task": 
+            {"id": task.task_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": bool(task.completed_at)
+        }
+        }
+    return (completed_task), 200 
+
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def mark_task_incomplete(task_id):
+    task = Task.query.get_or_404(task_id)            
+    task.completed_at = None
+    
+    db.session.commit() 
+    incomplete_task = {"task": 
+            {"id": task.task_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": bool(task.completed_at)
+        }
+        }
+    return jsonify(incomplete_task), 200 
\ No newline at end of file
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..98e4f9c44
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..f8ed4801f
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 000000000..8b3fb3353
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,96 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 000000000..2c0156303
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/migrations/versions/09338f19f84f_.py b/migrations/versions/09338f19f84f_.py
new file mode 100644
index 000000000..88e6b880e
--- /dev/null
+++ b/migrations/versions/09338f19f84f_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 09338f19f84f
+Revises: aea75a1fbbe9
+Create Date: 2021-06-08 08:11:53.117859
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '09338f19f84f'
+down_revision = 'aea75a1fbbe9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('is_complete', sa.DateTime(), nullable=True))
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.drop_column('task', 'is_complete')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/4c645f280bc7_.py b/migrations/versions/4c645f280bc7_.py
new file mode 100644
index 000000000..46e44df98
--- /dev/null
+++ b/migrations/versions/4c645f280bc7_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 4c645f280bc7
+Revises: 09338f19f84f
+Create Date: 2021-06-08 08:32:04.522533
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '4c645f280bc7'
+down_revision = '09338f19f84f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/9e0f4a672723_.py b/migrations/versions/9e0f4a672723_.py
new file mode 100644
index 000000000..918416405
--- /dev/null
+++ b/migrations/versions/9e0f4a672723_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 9e0f4a672723
+Revises: f88ac8035126
+Create Date: 2021-06-14 13:08:47.507314
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9e0f4a672723'
+down_revision = 'f88ac8035126'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('task_goal_id_fkey', 'task', type_='foreignkey')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_foreign_key('task_goal_id_fkey', 'task', 'goal', ['goal_id'], ['goal_id'])
+    # ### end Alembic commands ###
diff --git a/migrations/versions/aea75a1fbbe9_.py b/migrations/versions/aea75a1fbbe9_.py
new file mode 100644
index 000000000..e2facbb06
--- /dev/null
+++ b/migrations/versions/aea75a1fbbe9_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: aea75a1fbbe9
+Revises: d95606c21adc
+Create Date: 2021-06-07 15:48:13.536459
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'aea75a1fbbe9'
+down_revision = 'd95606c21adc'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('title', sa.VARCHAR(length=25), nullable=True))
+    op.drop_column('task', 'name')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('name', sa.VARCHAR(length=25), autoincrement=False, nullable=True))
+    op.drop_column('task', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/b585c164f783_.py b/migrations/versions/b585c164f783_.py
new file mode 100644
index 000000000..b84d6451f
--- /dev/null
+++ b/migrations/versions/b585c164f783_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: b585c164f783
+Revises: 4c645f280bc7
+Create Date: 2021-06-13 13:10:13.375918
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b585c164f783'
+down_revision = '4c645f280bc7'
+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))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('goal', 'title')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/c4b12816cc41_.py b/migrations/versions/c4b12816cc41_.py
new file mode 100644
index 000000000..62350c13c
--- /dev/null
+++ b/migrations/versions/c4b12816cc41_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: c4b12816cc41
+Revises: 9e0f4a672723
+Create Date: 2021-06-14 13:20:50.826507
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c4b12816cc41'
+down_revision = '9e0f4a672723'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    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')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/c89307b1053e_.py b/migrations/versions/c89307b1053e_.py
new file mode 100644
index 000000000..8741fbb21
--- /dev/null
+++ b/migrations/versions/c89307b1053e_.py
@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: c89307b1053e
+Revises: 
+Create Date: 2021-06-07 14:59:05.363443
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c89307b1053e'
+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.PrimaryKeyConstraint('task_id')
+    )
+    op.drop_table('tasks')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('tasks',
+    sa.Column('task_id', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('name', sa.VARCHAR(length=20), autoincrement=False, nullable=True),
+    sa.Column('description', sa.TEXT(), autoincrement=False, nullable=True),
+    sa.PrimaryKeyConstraint('task_id', name='tasks_pkey')
+    )
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/d95606c21adc_.py b/migrations/versions/d95606c21adc_.py
new file mode 100644
index 000000000..90f498fb8
--- /dev/null
+++ b/migrations/versions/d95606c21adc_.py
@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: d95606c21adc
+Revises: c89307b1053e
+Create Date: 2021-06-07 15:25:50.437776
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd95606c21adc'
+down_revision = 'c89307b1053e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True))
+    op.add_column('task', sa.Column('description', sa.String(), nullable=True))
+    op.add_column('task', sa.Column('name', sa.VARCHAR(length=25), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('task', 'name')
+    op.drop_column('task', 'description')
+    op.drop_column('task', 'completed_at')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/f88ac8035126_.py b/migrations/versions/f88ac8035126_.py
new file mode 100644
index 000000000..366c7f387
--- /dev/null
+++ b/migrations/versions/f88ac8035126_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: f88ac8035126
+Revises: b585c164f783
+Create Date: 2021-06-14 10:33:05.526438
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f88ac8035126'
+down_revision = 'b585c164f783'
+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/requirements.txt b/requirements.txt
index cfdf74050..5207bdfd4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,7 @@ python-dotenv==0.15.0
 python-editor==1.0.4
 requests==2.25.1
 six==1.15.0
+slackclient==2.9.3
 SQLAlchemy==1.3.23
 toml==0.10.2
 urllib3==1.26.4
diff --git a/tests/conftest.py b/tests/conftest.py
index d11083bf3..6ef384f25 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -31,7 +31,7 @@ def client(app):
 @pytest.fixture
 def one_task(app):
     new_task = Task(
-        title="Go on my daily walk 🏞", description="Notice something new every day", completed_at=None)
+        title="Go on my daily walk 🏞",description="Notice something new every day",completed_at=None)
     db.session.add(new_task)
     db.session.commit()
 
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index fb943d9b3..572905e73 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -19,14 +19,13 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     # Assert
     assert response.status_code == 200
     assert len(response_body) == 1
-    assert response_body == [
-        {
+    assert response_body == [{
             "id": 1,
             "title": "Go on my daily walk 🏞",
             "description": "Notice something new every day",
             "is_complete": False
-        }
-    ]
+        }]
+    
 
 
 def test_get_task(client, one_task):
@@ -39,7 +38,7 @@ def test_get_task(client, one_task):
     assert "task" in response_body
     assert response_body == {
         "task": {
-            "id": 1,
+            "task_id": 1,
             "title": "Go on my daily walk 🏞",
             "description": "Notice something new every day",
             "is_complete": False
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index 399daf4db..95196f773 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -2,7 +2,7 @@ def test_get_tasks_sorted_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