diff --git a/app/__init__.py b/app/__init__.py
index 2764c4cc8..d8ecfe622 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,5 +30,9 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    from .routes import task_bp
+    from .routes import goals_bp
+    app.register_blueprint(task_bp)
+    app.register_blueprint(goals_bp)
 
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 8cad278f8..f32db5a9a 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,6 +1,14 @@
 from flask import current_app
 from app import db
-
+from app.models.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="task", lazy=True)
+
+    def goal_json(self):
+        return( {
+            "id": self.goal_id,
+            "title": self.title
+        }, 200)
\ No newline at end of file
diff --git a/app/models/task.py b/app/models/task.py
index 39c89cd16..493022530 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,6 +1,29 @@
 from flask import current_app
 from app import db
-
+# 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)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.goal_id"), nullable=True)
+    __tablename__ = "tasks" 
+
+    def to_json(self):
+        if self.completed_at:
+            completed = True
+        else:
+            completed = False
+
+        task_dict={
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": completed,
+            "goal_id": self.goal_id # if the task belongs a goal add if not do not add
+        }
+
+        if self.goals_id:
+            task_dict["goal_id"]= self.goals_id
+        return task_dict
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..3abe1c2f4 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,273 @@
-from flask import Blueprint
+from app import db
+from flask import Blueprint, json
+from sqlalchemy import asc, desc
+from app.models import task 
+from app.models.task import Task
+from app.models.goal import Goal
+from datetime import datetime
+from sqlalchemy.sql.functions import now
+from flask import request, make_response, jsonify
+from dotenv import load_dotenv
+import os
+import requests
+
+load_dotenv()
+
+task_bp = Blueprint("tasks", __name__, url_prefix="/tasks")
+goals_bp = Blueprint("goals", __name__, url_prefix="/goals")
+
+
+# return all tasks
+@task_bp.route("/", methods=["GET", "POST"], strict_slashes = False)
+def handle_tasks():
+    if request.method == "GET":
+
+        # tasks by asc and desc order
+        sort_by_url = request.args.get("sort") # query parameters and replace the previous query
+        if sort_by_url == "asc": # this is a list queried by title in asc order
+            tasks = Task.query.order_by(Task.title.asc()).all() 
+        elif sort_by_url == "desc":
+            tasks = Task.query.order_by(Task.title.desc()).all() 
+        else:
+            tasks = Task.query.all()
+        # end of the new code
+    
+        tasks_response = []
+        for task in tasks:
+            if task.completed_at == None:
+                completed_at = False
+            else:
+                completed_at = True
+
+            tasks_response.append({
+                "id": task.task_id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": completed_at,
+            })
+        return make_response(jsonify(tasks_response), 200)
+
+
+#create a task with null completed at
+    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 {"details": "Invalid data"}, 400
+            
+        if not "completed_at" in request_body or not request_body["completed_at"]:
+            completed_at = False
+        else:
+            completed_at = True
+        
+        new_task = Task(
+            title=request_body["title"],
+            description=request_body["description"], 
+            completed_at=request_body["completed_at"]
+        )
+
+        db.session.add(new_task) # "adds model to the db"
+        db.session.commit() # commits the action above
+
+        return make_response({
+            "task":{ 
+                "id": new_task.task_id,
+                "title": new_task.title,
+                "description": new_task.description,
+                "is_complete": completed_at
+            }
+        }), 201   
+
+# return one task
+@task_bp.route("/<task_id>", methods=["GET", "PUT", "DELETE"], strict_slashes = False)
+def handle_task(task_id):
+    task = Task.query.get(task_id)
+
+    if request.method == "GET":
+        if task is None:
+            return make_response(f"Task #{task_id} not found"), 404
+        if not task.completed_at:
+            completed_at = False
+        else:
+            completed_at = task.completed_at["completed_at"]
+        return {
+            "task":{
+            "id": task.task_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": completed_at
+            }
+        }, 200
+
+    # Update a task
+    elif request.method == "PUT":
+        if task is None:
+            return make_response(f"Task #{task_id} not found"), 404
+        form_data = request.get_json()
+
+        if "title" not in form_data or "description" not in form_data or "completed_at" not in form_data:
+            return {"details": "Invalid data"}, 400
+
+        if not "completed_at" in form_data or not form_data["completed_at"]:
+            is_complete = False
+        else:
+            is_complete = True            
+        task.title = form_data["title"]
+        task.description = form_data["description"]
+        task.completed_at = form_data["completed_at"]
+
+        db.session.commit()
+        return {
+            "task": {
+                "id": task.task_id,
+                "title": task.title,
+                "description": task.description, 
+                "is_complete": is_complete
+            }
+        }, 200
+
+    # Delete a task
+    elif request.method == "DELETE":
+        if not task:
+            return "", 404
+        db.session.delete(task)
+        db.session.commit()
+        return {
+        "details": f"Task {task_id} \"{task.title}\" successfully deleted"
+        }, 200
+            
+
+# modify complete task
+@task_bp.route("/<task_id>/mark_complete", methods=["PATCH"], strict_slashes = False)
+def mark_task_complete(task_id):
+    task = Task.query.get(task_id)
+
+    if not task: # this is the task check (wash my car)
+        return make_response(f"Task #{task_id} not found"), 404
+    task.completed_at = datetime.utcnow()
+    db.session.commit()
+
+    base_path = "https://slack.com/api/chat.postMessage"
+    slack_tocken = os.environ.get("SLACK_API_KEY")
+    query_params = {
+        "channel": "task-notifications",
+        "text": f"Someone just completed the {task.title}"
+    }
+    headers = {
+        "Authorization": f"Bearer {slack_tocken}"
+    }
+    requests.post(base_path, params=query_params, headers=headers)
+
+    response_body = {
+        "task": {
+            "id": task.task_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete": True # this is always true bc we are always setting completed at
+        }
+    }
+    return jsonify(response_body), 200
+
+# modify incomplete task
+@task_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
+def make_task_incomplete(task_id):
+    task = Task.query.get(task_id)
+
+    if task is None:
+        return make_response(f"Task #{task_id} not found"), 404
+    else:
+        task.completed_at = None
+        db.session.commit()
+    response_body = {
+        "task": {
+            "id": task.task_id,
+            "title": task.title,
+            "description": task.description,
+            "is_complete":  False
+        }
+    }
+    return jsonify(response_body), 200
+
+
+# goals route
+@goals_bp.route("", methods = ["POST", "GET"], strict_slashes = False)
+def handle_goals():
+    if request.method == "POST":
+        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()
+        response_body = {
+            "goal": new_goal.goal_to_json()
+        }
+        return jsonify(response_body), 201
+
+    #get all goals
+    if request.method == "GET":
+        goals = Goal.query.all()
+        response_body = []
+        for a_goal in goals:
+            response_body.append(a_goal.goal_to_json())
+        return jsonify(response_body), 200
+
+# get one goal
+@goals_bp.route("/<goal_id>", methods=["GET", "PUT", "DELETE"], strict_slashes = False)
+def handle_goal(goal_id):
+    goal = Goal.query.get(goal_id)
+
+    if request.method == "GET":
+        
+        if goal is None:
+            return make_response("", 404)
+
+        response_body = {
+            "goal": goal.goal_to_json()
+        }
+        return jsonify(response_body), 200
+
+    # Update a goal
+    elif request.method == "PUT":
+        if goal is None:
+            return make_response(f"Goal #{goal_id} not found"), 404
+        form_data = request.get_json()
+
+        if "title" not in form_data:
+            return {"details": "Invalid data"}, 400
+
+        goal.title = form_data["title"]
+        db.session.commit()
+
+        response_body = {
+            "goal": goal.goal_to_json()
+        }
+        return jsonify(response_body), 200
+
+    # Delete a goal
+    elif request.method == "DELETE":
+        if not goal:
+            return "", 404
+        db.session.delete(goal)
+        db.session.commit()
+
+        return {
+            "details": f"Goal {goal.goal_id} \"{goal.title}\" successfully deleted"
+        }
+# one-to-many relationship
+@goals_bp.route("/<goal_id>/tasks", methods = ["POST", "GET"], strict_slashes = False)
+def handle_task_to_goals(goal_id):
+    goal = Goal.query.get(goal_id)
+    if not goal:
+        return "", 404
+
+    if request.method == "POST":
+        request_body = request.get_json()
+        task_ids = request_body["task_ids"]
+
+        for task_id in task_ids:
+            goal_id.task_id = goal_id
+
+            db.session.commit()
+
+        return {"id":(goal_id), "task_ids": task_ids},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/9c03144560f3_.py b/migrations/versions/9c03144560f3_.py
new file mode 100644
index 000000000..ff8dee40f
--- /dev/null
+++ b/migrations/versions/9c03144560f3_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 9c03144560f3
+Revises: d5d6e5350ef2
+Create Date: 2021-06-14 10:16:43.480262
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9c03144560f3'
+down_revision = 'd5d6e5350ef2'
+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/d5d6e5350ef2_.py b/migrations/versions/d5d6e5350ef2_.py
new file mode 100644
index 000000000..9c0d89f4a
--- /dev/null
+++ b/migrations/versions/d5d6e5350ef2_.py
@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: d5d6e5350ef2
+Revises: 
+Create Date: 2021-06-10 15:13:41.917871
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd5d6e5350ef2'
+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.Column('goal_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['goal_id'], ['goal.goal_id'], ),
+    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 ###