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..bc5f6cddd 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -12,6 +12,11 @@
 
 def create_app(test_config=None):
     app = Flask(__name__)
+
+    from .routes import tasks_bp, goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
     if test_config is None:
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..cc0b6fe6e 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -3,4 +3,6 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
+    title = db.Column(db.String)
+    tasks = db.relationship('Task', backref='goal', lazy=True)
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..4c1403673 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -3,4 +3,9 @@
 
 
 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)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.id'), nullable=True)
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..2e81b53c0 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,260 @@
-from flask import Blueprint
+from flask import request, Blueprint, make_response, jsonify
+from app.models.task import Task
+from app import db
+from datetime import datetime
+import os
+import requests
 
+tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+
+@tasks_bp.route("", strict_slashes=False, methods=["GET", "POST"])
+def handle_tasks():
+    if request.method == "GET":
+        sort_method = request.args.get("sort")
+        if sort_method == "asc":
+            tasks = Task.query.order_by(Task.title.asc()).all() 
+        elif sort_method == "desc":
+            tasks = Task.query.order_by(Task.title.desc()).all() 
+        else:
+            tasks = Task.query.all()
+        
+        tasks_response = []
+        for task in tasks:
+            tasks_response.append(
+                {
+                "id": task.id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.completed_at or False
+            })
+        return jsonify(tasks_response)
+    elif request.method == "POST":
+        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 make_response(jsonify({ "details": "Invalid data" }), 400)
+        
+        new_task = Task(title=request_body["title"],
+                        description=request_body["description"],
+                        completed_at=request_body["completed_at"],
+                        )
+
+        if "completed_at" in request_body:
+            new_task.completed_at = request_body["completed_at"]
+            # set_task = True   - Todo: Why couldn't I just set it here? Shouldn't need to set task below
+
+        set_task_status = True if new_task.completed_at else False
+
+        db.session.add(new_task)
+        db.session.commit()
+        return make_response(jsonify({"task": { # todo - not really using jsonify?
+            "id": new_task.id,
+            "title": new_task.title,
+            "description": new_task.description,
+            "is_complete": set_task_status
+        }
+        }), 201)
+
+@tasks_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE"])
+def handle_tast(task_id):
+    task = Task.query.get(task_id)
+    if not task:
+        return make_response(f"Invalid data", 404)
+
+    if request.method == "GET":
+
+        get_one_task_response = {
+            "task": {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": task.completed_at or False
+            } 
+        }
+        if  not task.goal_id:
+            return get_one_task_response
+        else:
+            get_one_task_response["task"]["goal_id"] = task.goal_id
+        return get_one_task_response 
+
+    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()
+
+        set_task_status = True if task.completed_at else False
+
+        return make_response(jsonify({"task": {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": set_task_status
+        }}))
+        
+    elif request.method == "DELETE":
+        db.session.delete(task)
+        db.session.commit()
+        return jsonify({'details': f'Task {task_id} "{task.title}" successfully deleted'})
+
+@tasks_bp.route("/<task_id>/mark_complete", strict_slashes=False, methods=["PATCH"])
+def mark_complete(task_id):
+    task = Task.query.get(task_id)
+    if not task:
+        return make_response(f"Task {task_id} not found", 404)
+        
+    task.completed_at  = datetime.utcnow()
+    db.session.commit()
+
+    posts_message_to_slack(task)
+
+    return make_response(jsonify({"task": {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": True
+        }}))
+
+@tasks_bp.route("/<task_id>/mark_incomplete", strict_slashes=False, methods=["PATCH"])
+def mark_incomplete(task_id):
+    task = Task.query.get(task_id)
+    if not task:
+        return make_response(f"Task {task_id} not found", 404)
+
+    task.completed_at = None
+    db.session.commit()
+
+    return make_response(jsonify({
+        "task": {
+            "id": task.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": False
+        }
+    }))
+
+
+def posts_message_to_slack(task):
+    slack_path = "https://slack.com/api/chat.postMessage"
+    slack_token = os.environ.get("SLACK_POST_MESSAGE_API_KEY")
+    params = {
+        "channel": "task-notifications",
+        "text": f"Task completed: {task.title}", 
+    }
+    headers = {"Authorization": f"Bearer {slack_token}"}
+    requests.post(slack_path, params = params, headers = headers)
+
+
+
+
+
+
+
+# todo - separate out the route files
+from app.models.goal import Goal
+
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+@goals_bp.route("", strict_slashes=False, methods=["GET", "POST"])
+def handle_goals():
+    if request.method == "GET":
+        goals = Goal.query.all()
+        goals_response = []
+        for goal in goals:
+            goals_response.append({
+                "id": goal.id,
+                "title": goal.title
+            })
+        return jsonify(goals_response)
+    elif request.method == "POST":
+        request_body = request.get_json()
+        if "title" not in request_body:
+            return make_response({"details": "Invalid data"}, 400)   
+        new_goal = Goal(title=request_body["title"])
+            
+        db.session.add(new_goal)
+        db.session.commit()
+        
+        return make_response({"goal":
+            {
+                "id": new_goal.id,
+                "title": new_goal.title
+                }
+        }, 201)
+
+@goals_bp.route("/<goal_id>", strict_slashes=False, methods=["GET", "PUT", "DELETE"])
+def handle_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        return make_response(f"Goal {goal_id} not found", 404)
+
+    if request.method == "GET":
+        return {
+            "goal": {"id": goal.id,
+                    "title": goal.title}
+        }
+    elif request.method == "PUT":
+        form_data = request.get_json()
+        goal.title = form_data["title"],
+
+        db.session.commit()
+        
+        return make_response({
+            "goal":{
+                "id": goal.id,
+                "title": goal.title
+            }
+        }           
+        )
+    elif request.method == "DELETE":
+        db.session.delete(goal)
+        db.session.commit()
+        return make_response(
+            {"details": 
+                f"Goal {goal.id} \"{goal.title}\" successfully deleted"
+            }
+        )
+        
+@goals_bp.route("/<goal_id>/tasks", strict_slashes=False, methods=["GET"])
+def get_goal_tasks(goal_id):
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        return make_response(f"Goal {goal_id} not found", 404)
+    tasks = goal.tasks
+    tasks_details = []
+    for task in tasks:
+        task_dict = {
+            "id": task.id,
+            "goal_id": goal.id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": task.completed_at or False
+        }
+        tasks_details.append(task_dict)
+    return make_response(
+        {
+            "id": goal.id,
+            "title": goal.title,
+            "tasks": tasks_details
+        })       
+
+@goals_bp.route("/<goal_id>/tasks", strict_slashes=False, methods=["POST"])
+def add_goal_tasks(goal_id):
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        return make_response(f"Goal {goal_id} not found", 404)
+    
+    request_body = request.get_json()   
+    for id in request_body["task_ids"]:
+        task = Task.query.get(id)
+        goal.tasks.append(task)
+            
+        db.session.add(goal)
+        db.session.commit()
+        
+    return make_response(
+            {
+                "id": goal.id,
+                "task_ids": request_body["task_ids"]
+                })       
\ 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/1a5f453e6e23_.py b/migrations/versions/1a5f453e6e23_.py
new file mode 100644
index 000000000..7794a586a
--- /dev/null
+++ b/migrations/versions/1a5f453e6e23_.py
@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: 1a5f453e6e23
+Revises: e9c18760196b
+Create Date: 2021-06-14 18:27:15.965411
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1a5f453e6e23'
+down_revision = 'e9c18760196b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('goal', sa.Column('id', sa.Integer(), nullable=False))
+    op.drop_column('goal', 'goal_id')
+    op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True))
+    op.add_column('task', sa.Column('id', sa.Integer(), autoincrement=True, nullable=False))
+    op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['id'])
+    op.drop_column('task', 'task_id')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False))
+    op.drop_constraint(None, 'task', type_='foreignkey')
+    op.drop_column('task', 'id')
+    op.drop_column('task', 'goal_id')
+    op.add_column('goal', sa.Column('goal_id', sa.INTEGER(), autoincrement=True, nullable=False))
+    op.drop_column('goal', 'id')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/af127619552a_.py b/migrations/versions/af127619552a_.py
new file mode 100644
index 000000000..f2694f139
--- /dev/null
+++ b/migrations/versions/af127619552a_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: af127619552a
+Revises: 
+Create Date: 2021-06-09 10:15:07.779325
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'af127619552a'
+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(), autoincrement=True, 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/migrations/versions/e9c18760196b_.py b/migrations/versions/e9c18760196b_.py
new file mode 100644
index 000000000..956571a9b
--- /dev/null
+++ b/migrations/versions/e9c18760196b_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: e9c18760196b
+Revises: af127619552a
+Create Date: 2021-06-14 17:36:30.107483
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e9c18760196b'
+down_revision = 'af127619552a'
+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 ###