diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..cfa96cf3f 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,7 +4,6 @@
 import os
 from dotenv import load_dotenv
 
-
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
@@ -30,5 +29,10 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
-
+    from app.models.task import Task
+    from app.models.goal import Goal
+    from .routes import tasks_bp, goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+    
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..e39961632 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,6 +1,21 @@
 from flask import current_app
 from app import db
 
-
 class Goal(db.Model):
     goal_id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.Text)
+    tasks = db.relationship("Task", backref="goals", lazy=True)
+    __tablename__ = "goals"
+    
+    def to_json(self):
+        if self.tasks != []:
+            return {
+                "id": self.goal_id,
+                "title": self.title,
+                "tasks": self.tasks
+            }
+        else:
+            return {
+                    "id": self.goal_id,
+                    "title": self.title,
+                }
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..040f29eb9 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,30 @@
-from flask import current_app
 from app import db
 
-
 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)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goals.goal_id"), nullable=True)
+    __tablename__ = "tasks"
+
+    def to_json(self):
+        is_complete = self.completed_at
+        if self.completed_at == None:
+            is_complete = False
+        else:
+            is_complete = True
+        if self.goal_id != None:    
+            return {
+                    "id": self.task_id,
+                    "title": self.title,
+                    "description": self.description,
+                    "is_complete": is_complete,
+                    "goal_id": self.goal_id
+                }
+        return {
+                    "id": self.task_id,
+                    "title": self.title,
+                    "description": self.description,
+                    "is_complete": is_complete
+        }
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..6b96c5dda 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,210 @@
-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, make_response
+from datetime import datetime
+import os
+import requests
 
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@goals_bp.route("/<goal_id>/tasks", methods=["POST"], strict_slashes=False)
+def assign_tasks_to_one_goal(goal_id):
+    request_body = request.get_json()
+
+    goal = Goal.query.get(goal_id)
+
+    task_ids = request_body["task_ids"]
+
+    for task_id in task_ids:
+        task = Task.query.get(task_id)
+        goal.tasks.append(task)
+        
+    db.session.commit()
+
+    return make_response({
+        "id": goal.goal_id,   
+        "task_ids": task_ids     
+    }, 200)
+
+
+@goals_bp.route("/<goal_id>/tasks", methods=["GET"], strict_slashes=False)
+def get_tasks_from_goal_id(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+    tasks = goal.tasks
+
+    tasks_response = []
+
+    for task in tasks:
+        tasks_response.append(task.to_json())
+    
+    goal_response = goal.to_json()
+    goal_response["tasks"] = tasks_response
+
+    return goal_response, 200
+0
+@goals_bp.route("", methods=["POST"], strict_slashes=False)
+def create_goal():
+    request_body = request.get_json()
+    
+    try:
+        new_goal = Goal(title=request_body["title"])
+
+    except KeyError:
+        return make_response({
+            "details": "Invalid data"
+        }, 400)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return {
+        "goal": new_goal.to_json()
+    }, 201
+
+@goals_bp.route("/<goal_id>", methods=["GET"], strict_slashes=False)
+def get_one_goal(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+
+    return {
+        "goal": goal.to_json()}, 200
+
+@goals_bp.route("", methods=["GET"], strict_slashes=False)
+def goals_index():
+    goals = Goal.query.all()
+    goals_response = []
+    for goal in goals:
+        goals_response.append(goal.to_json())
+
+    return jsonify(goals_response), 200
+
+@goals_bp.route("/<goal_id>", methods=["PUT"], strict_slashes=False)
+def update_goal(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+    form_data = request.get_json()
+    
+    goal.title = form_data["title"]
+
+    db.session.commit()
+
+    return {
+        "goal": goal.to_json()
+    }, 200
+
+@goals_bp.route("/<goal_id>", methods=["DELETE"], strict_slashes=False)
+def delete_goal(goal_id):
+    goal = Goal.query.get_or_404(goal_id)
+    
+    db.session.delete(goal)
+    db.session.commit()
+
+    return make_response({
+        "details": f'Goal {goal.goal_id} "{goal.title}" successfully deleted'
+    })
+
+
+@tasks_bp.route("", methods=["GET"], strict_slashes=False) 
+def tasks_index():
+    sort_type = request.args.get("sort")
+
+    if sort_type == "desc":
+        tasks = Task.query.order_by(Task.title.desc())
+    elif sort_type == "asc":
+        tasks = Task.query.order_by(Task.title.asc())
+    else:
+        tasks = Task.query.all()
+    
+    tasks_response = []
+
+    for task in tasks:
+        tasks_response.append(task.to_json())
+
+    return jsonify(tasks_response), 200
+    
+@tasks_bp.route("/<task_id>", methods=["GET"], strict_slashes=False)
+def get_one_task(task_id):
+    task = Task.query.get_or_404(task_id)
+
+    return {
+        "task": task.to_json()}, 200
+        
+@tasks_bp.route("", methods=["POST"], strict_slashes=False)
+def create_task():
+    request_body = request.get_json()
+
+    try:
+        new_task = Task(title=request_body["title"],
+                        description=request_body["description"],
+                        completed_at=request_body["completed_at"])
+
+    except KeyError:
+        return make_response({
+            "details": "Invalid data"
+        }, 400)
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    return {
+        "task": new_task.to_json()
+    }, 201
+
+@tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
+def update_task(task_id):
+    task = Task.query.get_or_404(task_id)
+    form_data = request.get_json()
+
+    task.title = form_data["title"]
+    task.description = form_data["description"]
+    task.is_complete = form_data["completed_at"]
+
+    db.session.commit()
+
+    return {
+        "task": task.to_json()
+    }, 200
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"], strict_slashes=False)
+def delete_task(task_id):
+    task = Task.query.get_or_404(task_id)
+    
+    db.session.delete(task)
+    db.session.commit()
+
+    return make_response({
+        "details": f'Task {task.task_id} "{task.title}" successfully deleted'
+    })
+
+@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"], strict_slashes=False)
+def task_mark_complete(task_id):
+    task = Task.query.get_or_404(task_id)
+    current_datetime = datetime.utcnow()
+    
+    task.completed_at = current_datetime
+    
+    db.session.commit()
+
+    response = requests.get('https://slack.com/api/chat.postMessage',\
+            params={
+            "channel": "task-notifications",
+            "text": f"Someone just completed the task {task.title}"},
+            headers={'Authorization': os.environ['SLACK_TOKEN']})
+            
+    return {
+        "task": task.to_json()
+    }, 200
+
+    
+@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"], strict_slashes=False)
+def task_mark_incomplete(task_id):
+    task = Task.query.get_or_404(task_id)
+
+    if task.completed_at != None:
+        task.completed_at = None
+
+    db.session.commit()
+
+    return {
+        "task": task.to_json()
+    }, 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/9e580fca5438_.py b/migrations/versions/9e580fca5438_.py
new file mode 100644
index 000000000..9b79c5758
--- /dev/null
+++ b/migrations/versions/9e580fca5438_.py
@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 9e580fca5438
+Revises: 
+Create Date: 2021-05-12 00:12:28.983412
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9e580fca5438'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goals',
+    sa.Column('goal_id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('goal_id')
+    )
+    op.create_table('tasks',
+    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.Column('goal_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['goal_id'], ['goals.goal_id'], ),
+    sa.PrimaryKeyConstraint('task_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('tasks')
+    op.drop_table('goals')
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index cfdf74050..e5315b483 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,6 @@
+aiohttp==3.7.4.post0
 alembic==1.5.4
+async-timeout==3.0.1
 attrs==20.3.0
 autopep8==1.5.5
 certifi==2020.12.5
@@ -14,6 +16,7 @@ itsdangerous==1.1.0
 Jinja2==2.11.3
 Mako==1.1.4
 MarkupSafe==1.1.1
+multidict==5.1.0
 packaging==20.9
 pluggy==0.13.1
 psycopg2-binary==2.8.6
@@ -26,7 +29,10 @@ 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
+typing-extensions==3.10.0.0
 urllib3==1.26.4
 Werkzeug==1.0.1
+yarl==1.6.3
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 48ecd0523..a0dcdcf7c 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -90,7 +90,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
 
 
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
-    response = client.get("/tasks/1")
+    response = client.get("/tasks/1") 
     response_body = response.get_json()
 
     assert response.status_code == 200