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..bdf0aa008 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -23,12 +23,22 @@ def create_app(test_config=None):
             "SQLALCHEMY_TEST_DATABASE_URI")
 
     # 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)
 
     # Register Blueprints here
 
+    #task
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+
+    #goal
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
+
+    from app.models.task import Task
+    from app.models.goal import Goal
+
+
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..eec50e3aa 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,4 +3,21 @@
 
 
 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(50))
+    tasks = db.relationship('Task', backref='goal', lazy=True)
+
+    def create_goal_json(self):
+
+        return {
+                'id' : self.id,
+                'title' : self.title
+        }
+    
+    def from_json(request_dict):
+        # Converts JSON into a new instance of Task
+        new_goal = Goal(
+        title = request_dict["title"]
+        )
+
+        return new_goal
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..2e711f58d 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,48 @@
 from flask import current_app
 from app import db
+from flask import Blueprint
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String(50))
+    description = db.Column(db.String(50)) 
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True)
+    
+
+    def create_json(self):
+        if self.completed_at == None:
+            completed = False
+        else:
+            completed = True
+
+        return {
+                'id' : self.id,
+                'title' : self.title,
+                'description' : self.description,
+                'is_complete' : completed
+        }
+
+    def create_json_with_goal_id(self):
+        if self.completed_at == None:
+            completed = False
+        else:
+            completed = True
+
+        return {
+                'id' : self.id,
+                'goal_id' : self.goal_id,
+                'title' : self.title,
+                'description' : self.description,
+                'is_complete' : completed
+        }
+    
+    def from_json(request_dict):
+        new_task = Task(
+        title = request_dict["title"],
+        description = request_dict["description"],
+        completed_at = request_dict["completed_at"]
+        )
+
+        return new_task
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..022c2bbf1 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,299 @@
-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 sqlalchemy import asc, desc
+from datetime import datetime
+import os
+import requests
+
+
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+
+@tasks_bp.route("", methods=["GET"], strict_slashes=False)
+def get_all_tasks():
+
+    sort_query = request.args.get("sort")
+
+    tasks_response = []
+    sorted_response = []
+    ordered_query = []
+
+    
+    if sort_query is None and sort_query is None:
+        tasks = Task.query.all()
+
+        for task in tasks:           
+            tasks_response.append(task.create_json())
+            
+        return make_response(jsonify(tasks_response), 200)  
+    
+    if sort_query == "asc":
+
+        ordered_query = Task.query.order_by(Task.title.asc())
+        
+    elif sort_query == "desc":
+
+        ordered_query = Task.query.order_by(Task.title.desc())
+    
+    elif sort_query == "id":
+
+        ordered_query = Task.query.order_by(Task.id)
+
+    for task in ordered_query:
+        sorted_response.append(task.create_json())
+    
+    return jsonify(sorted_response), 200
+
+
+        
+@tasks_bp.route("", methods=["POST"], strict_slashes=False)
+def create_new_task():
+
+    request_body = request.get_json()
+    if not request_body or not request_body.get("title") or not request_body.get("description") or "completed_at" not in request_body:
+        return make_response({"details": "Invalid data"}, 400)
+    
+    new_task = Task.from_json(request_body)
+
+    db.session.add(new_task)
+    db.session.commit()
+
+    return make_response({"task": new_task.create_json()}, 201)
+
+
+@tasks_bp.route("/<task_id>", methods=["GET"], strict_slashes=False)
+def get_task_by_id(task_id):
+    request_body = request.get_json()
+    task = Task.query.get(task_id)
+
+    if task is None:
+            return make_response("", 404)
+
+    if task.goal_id is None:
+        return make_response({"task": task.create_json()}, 200)
+    
+    else:
+    
+        return make_response({"task": task.create_json_with_goal_id()}, 200)      
+
+
+@tasks_bp.route("/<task_id>", methods=["PUT"], strict_slashes=False)
+def update_task(task_id):
+    task = Task.query.get(task_id)
+
+    if task is None:
+            return make_response("", 404)
+
+    else:
+        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()
+        return make_response({"task": task.create_json()}, 200)
+
+
+@tasks_bp.route("/<task_id>", methods=["DELETE"], strict_slashes=False)
+def delete_task(task_id):   
+    task = Task.query.get(task_id)
+
+    if task is None:
+        return make_response("", 404)
+
+    else:
+        db.session.delete(task)
+        db.session.commit()
+
+    return make_response({"details":f"Task {task.id} \"{task.title}\" successfully deleted"}, 200)
+
+
+@tasks_bp.route("<task_id>/mark_complete", methods=["PATCH"], strict_slashes=False)
+def mark_complete(task_id):
+    task = Task.query.get(task_id)
+
+    if task is None:
+            return make_response("", 404)
+
+    task.completed_at = datetime.utcnow()
+    db.session.commit()
+
+    SLACK_TOKEN = os.environ["SLACK_API_TOKEN"]
+    slack_channel = "task-notifications"
+    slack_icon_url = "https://slack.com/api/chat.postMessage"
+    text = f"Someone just completed the task {task.title}"
+
+    response = requests.post('https://slack.com/api/chat.postMessage', {
+        'token': slack_token,
+        'channel': slack_channel,
+        'text': text,
+        'icon_url': slack_icon_url
+    }).json()	
+
+    return make_response({"task": task.create_json()}, 200)
+    
+
+@tasks_bp.route("<task_id>/mark_incomplete", methods=["PATCH"], strict_slashes=False)
+def mark_incomplete(task_id):
+    task = Task.query.get(task_id)
+
+    if task is None:
+            return make_response("", 404)
+
+    task.completed_at = None
+    db.session.commit()
+
+    return make_response({"task": task.create_json()}, 200)
+
+
+@goals_bp.route("", methods=["GET"], strict_slashes=False)
+def get_all_goals():
+
+    ordered_query = []
+    sorted_response = []
+
+    sort_query = request.args.get("sort")
+
+    if not sort_query:
+
+        goals_response = []
+        goals = Goal.query.all()
+        
+        for goal in goals:           
+            goals_response.append(goal.create_goal_json())
+            
+        return make_response(jsonify(goals_response), 200) 
+    
+    if sort_query == "asc":
+
+        ordered_query = Goal.query.order_by(Goal.title.asc())
+    
+    elif sort_query == "desc":
+
+        ordered_query = Goal.query.order_by(Goal.title.desc())
+    
+    for goal in ordered_query: 
+        sorted_response.append(goal.create_goal_json())
+
+    return make_response(jsonify(sorted_response), 200) 
+
+
+@goals_bp.route("", methods=["POST"], strict_slashes=False)
+def create_goals():
+    request_body = request.get_json()
+    if not request_body or not request_body.get("title"):
+        return make_response({"details": "Invalid data"}, 400)
+
+    new_goal = Goal.from_json(request_body)
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return make_response({"goal": new_goal.create_goal_json()}, 201)
+
+
+@goals_bp.route("<goal_id>", methods=["GET"], strict_slashes=False)
+def get_one_goal(goal_id):
+
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return make_response("", 404)
+    
+
+    return make_response({"goal": goal.create_goal_json()}, 200)
+
+
+@goals_bp.route("<goal_id>", methods=["PUT"], strict_slashes=False)
+def update_goal(goal_id):
+
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return make_response("", 404)
+    
+    form_data = request.get_json()
+    goal.title = form_data["title"]
+
+    db.session.commit()
+    return make_response({"goal": goal.create_goal_json()}, 200)
+
+
+@goals_bp.route("<goal_id>", methods=["DELETE"], strict_slashes=False)
+def delete_goal(goal_id):
+
+    goal = Goal.query.get(goal_id)
+
+    if goal is None:
+        return make_response("", 404)
+    
+    else:
+
+        db.session.delete(goal)
+        db.session.commit()
+
+    return make_response({"details": f'Goal {goal.id} \"{goal.title}\" successfully deleted'}, 200)
+
+
+@goals_bp.route("<goal_id>/tasks", methods=["POST"], strict_slashes=False)
+def add_tasks_to_goals(goal_id):
+
+    goal_id = int(goal_id)
+    request_body = request.get_json()
+    task_ids = request_body["task_ids"]
+    goal = Goal.query.get(goal_id)
+
+    task_id_list =[]
+
+    if not request_body:
+        return make_response({"details": "Invalid data"}, 400)
+
+
+    for task_id in task_ids:
+        task = Task.query.get(task_id)
+        task.goal_id = goal_id 
+
+        task_id_list.append(task_id)
+
+        db.session.add(task)
+        db.session.commit()  
+
+
+    return make_response({"id": goal_id, "task_ids": task_id_list}, 200)
+    
+
+@goals_bp.route("<goal_id>/tasks", methods=["GET"], strict_slashes=False)
+def get_tasks_of_one_goal(goal_id):
+
+    goal_id = int(goal_id)
+    goal = Goal.query.get(goal_id)
+
+
+    if not goal:
+        return make_response("", 404)
+    
+    tasks = goal.tasks
+
+
+    task_list = []
+    for task in tasks:
+
+        task_list.append(task.create_json_with_goal_id())
+
+    response = {
+        "id" : goal_id,
+        "title" : goal.title,
+        "tasks" : task_list
+    }
+
+    return make_response(response, 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/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py b/migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py
new file mode 100644
index 000000000..0cd6b20ef
--- /dev/null
+++ b/migrations/versions/3b2561fc3cbf_adds_foreign_key_column_to_task_class.py
@@ -0,0 +1,30 @@
+"""Adds foreign key column to Task class
+
+Revision ID: 3b2561fc3cbf
+Revises: 3eed734372b2
+Create Date: 2021-05-08 11:01:05.302194
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3b2561fc3cbf'
+down_revision = '3eed734372b2'
+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'], ['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/3eed734372b2_adds_models_task_py_and_goal_py.py b/migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py
new file mode 100644
index 000000000..0b5640064
--- /dev/null
+++ b/migrations/versions/3eed734372b2_adds_models_task_py_and_goal_py.py
@@ -0,0 +1,40 @@
+"""Adds models task.py and goal.py
+
+Revision ID: 3eed734372b2
+Revises: 
+Create Date: 2021-05-06 11:34:29.641628
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3eed734372b2'
+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(length=50), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('task',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(length=50), nullable=True),
+    sa.Column('description', sa.String(length=50), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/tests/conftest.py b/tests/conftest.py
index d11083bf3..d787c470c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -74,6 +74,15 @@ def one_goal(app):
     db.session.add(new_goal)
     db.session.commit()
 
+#This fixture gets called in tests for returning goals sorted by title
+@pytest.fixture
+def three_goals(app):
+    db.session.add_all([
+        Goal(title="Get more excercise"), 
+        Goal(title="Eat healthy"), 
+        Goal(title="Get better sleep")
+    ])
+    db.session.commit()
 
 # This fixture gets called in every test that
 # references "one_task_belongs_to_one_goal"
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index 399daf4db..6d47df8d7 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -50,3 +50,4 @@ def test_get_tasks_sorted_desc(client, three_tasks):
             "is_complete": False,
             "title": "Answer forgotten email 📧"},
     ]
+
diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py
new file mode 100644
index 000000000..d935e0a12
--- /dev/null
+++ b/tests/test_wave_07.py
@@ -0,0 +1,69 @@
+# #test to get tasks sorted by id
+# def test_get_tasks_sorted_by_id(client, three_tasks):
+#     # Act
+#     response = client.get("/tasks?sort=id")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 200
+#     assert len(response_body) == 3
+#     assert response_body == [
+#         {
+#             "description": "",
+#             "id": 1,
+#             "is_complete": False,
+#             "title": "Water the garden 🌷"},
+#         {
+#             "description": "",
+#             "id": 2,
+#             "is_complete": False,
+#             "title": "Answer forgotten email 📧"},
+#         {
+#             "description": "",
+#             "id": 3,
+#             "is_complete": False,
+#             "title": "Pay my outstanding tickets 😭"}
+#     ]
+    
+
+# #Tests for goals sorted by title asc/desc
+# def test_get_goals_sorted_asc(client, three_goals):
+#     # Act
+#     response = client.get("/goals?sort=asc")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 200
+#     assert len(response_body) == 3
+#     assert response_body == [
+#         {   
+#             "id" : 2,
+#             "title": "Eat healthy"},
+#         {   "id" : 3, 
+#             "title": "Get better sleep"}, 
+#         {   
+#             "id" : 1,
+#             "title": "Get more excercise"}
+#     ]
+
+
+# #Test for getting a response body with goals sorted by title
+# def test_get_goals_sorted_desc(client, three_goals):
+#     # Act
+#     response = client.get("/goals?sort=desc")
+#     response_body = response.get_json()
+
+#     # Assert
+#     assert response.status_code == 200
+#     assert len(response_body) == 3
+#     assert response_body == [
+#         {   
+#             "id" : 1,
+#             "title": "Get more excercise"}, 
+#         {   "id" : 3, 
+#             "title": "Get better sleep"},
+#         {   
+#             "id" : 2,
+#             "title": "Eat healthy"} 
+#     ]
+
diff --git a/utilities.py b/utilities.py
new file mode 100644
index 000000000..769f85fa4
--- /dev/null
+++ b/utilities.py
@@ -0,0 +1,37 @@
+
+
+
+# def sort_tasks(tasks):
+    
+    # q = request.args.get("sort")
+    # tasks_response = []
+
+    # for task in tasks:
+    
+    #     tasks_response.append(task.create_json())
+
+    #     if q == "asc":
+        
+    #         sorted_tasks = task.sort()
+    #         tasks_response.append(sorted_tasks)
+                    
+    #     elif q == desc:
+    #         sorted_tasks = task.sort(reverse=True)
+    #         tasks_response.append(sorted_tasks) 
+
+    #     return make_response(jsonify(tasks_response), 200)
+
+    # def make_sorted_json():
+
+    #     if completed_at == None:
+    #     completed = False
+
+    #     else:
+    #         completed = True
+
+    #     return {
+    #             'id' : self.id,
+    #             'title' : self.title,
+    #             'description' : self.description,
+    #             'is_complete' : completed
+    #     }