diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..066ed31d9
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'
diff --git a/app/__init__.py b/app/__init__.py
index 70b4cabfe..505a216e7 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,7 +1,51 @@
 from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+from dotenv import load_dotenv
+import os
 
 
+db = SQLAlchemy()
+migrate = Migrate()
+load_dotenv()
+
+db = SQLAlchemy()
+migrate = Migrate()
+load_dotenv()
+
 def create_app(test_config=None):
     app = Flask(__name__)
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+
+    if not test_config:
+
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
+            "SQLALCHEMY_DATABASE_URI")
+    else:
+        app.config["TESTING"] = True
+        # app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
+            "SQLALCHEMY_TEST_DATABASE_URI")
+
+    db.init_app(app)
+    migrate.init_app(app, db)
+
+    from app.models.planet import Planet
+
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    if not test_config:
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
+    else:
+        app.config["TESTING"] = True
+        app.config['SQLALCHEMY_TEST_DATABASE_URI'] = os.environ.get('SQLALCHEMY_TEST_DATABASE_URI')
+
+
+    db.init_app(app)
+    migrate.init_app(app, db)
+
+    from .models.planet import Planet
+
+    from .routes import bp
+    app.register_blueprint(bp)
 
-    return app
+    return app
\ No newline at end of file
diff --git a/app/models/__init__.py b/app/models/__init__.py
new file mode 100644
index 000000000..dc064be11
--- /dev/null
+++ b/app/models/__init__.py
@@ -0,0 +1,29 @@
+# from flask import Flask
+# from flask_sqlalchemy import SQLAlchemy
+# from flask_migrate import Migrate
+
+# db = SQLAlchemy()
+# migrate = Migrate()
+
+
+# def create_app(test_config=None):
+#     app = Flask(__name__)
+
+#     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    
+#     if not test_config:
+
+#         app.config['SQLALCHEMY_DATABASE_URI'] = SQLALCHEMY_DATABASE_URI
+
+#     else: 
+#         app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://postgres:postgres@localhost:5432/solar_system_development'
+    
+#     from app.models.planet import Planet 
+
+#     db.init_app(app)
+#     migrate.init_app(app, db)
+
+#     # from .routes import bp
+#     # app.register_blueprint(bp)
+
+#     return app
\ No newline at end of file
diff --git a/app/models/planet.py b/app/models/planet.py
new file mode 100644
index 000000000..990bfd6ab
--- /dev/null
+++ b/app/models/planet.py
@@ -0,0 +1,17 @@
+from app import db
+
+class Planet(db.Model):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    name = db.Column(db.String, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    has_moon = db.Column(db.Boolean, nullable=False)
+
+
+    #planet turn itself into dictionary
+    def to_dict(self):
+        return ({
+            "id": self.id,
+            "name": self.name,
+            "description":  self.description,
+            "has_moon":  self.has_moon
+        })
diff --git a/app/routes.py b/app/routes.py
index 8e9dfe684..1733c0533 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,2 +1,114 @@
-from flask import Blueprint
 
+import re
+from flask import Blueprint, jsonify, abort, make_response, request
+from app import db
+from .models.planet import Planet
+
+
+
+#instantiate blueprint object
+bp = Blueprint("planets_bp",__name__, url_prefix="/planets")
+
+#helper function to get one planet by id or return error message
+def get_planet_by_id(id):
+    try:
+        id = int(id)
+    except ValueError:
+        abort(make_response(jsonify(dict(details=f"Invalid id {id}")), 400))
+
+    planet = Planet.query.get(id)
+
+    if planet:
+        return planet 
+
+    else: 
+        abort(make_response(jsonify(dict(details=f"Invalid id {id}")), 404))
+   
+#create a planet
+@bp.route("", methods=["POST"])
+def create_planet():
+    request_body = request.get_json()
+    new_planet = Planet(
+        name=request_body["name"],
+        description=request_body["description"],
+        has_moon=request_body["has_moon"],
+    )
+    db.session.add(new_planet)
+    db.session.commit()
+
+    return make_response(f"Planet {new_planet.name} successfully created"), 201
+
+#read all planets
+@bp.route("", methods=["GET"])
+def read_all_planets():
+    #query params for /planets endpoint
+    #planets?<key>=<value>
+    name_query = request.args.get("name")
+    description_query = request.args.get("description")
+    has_moon_query = request.args.get("has_moon")
+
+
+    if name_query:
+        planets = Planet.query.filter_by(name=name_query)
+    elif description_query:
+        planets = Planet.query.filter_by(description=description_query)
+    elif has_moon_query:
+        planets = Planet.query.filter_by(has_moon=has_moon_query)
+    else:
+        planets = Planet.query.all()
+    planets_response = [planet.to_dict() for planet in planets]
+    return jsonify(planets_response)
+
+#get one existing planet   
+@bp.route("/<planet_id>", methods=["GET"])
+def read_one_planet(planet_id):
+    planet = get_planet_by_id(planet_id)
+    return jsonify(planet.to_dict())
+
+#replace one existing planet
+@bp.route("/<planet_id>", methods=["PUT"])
+def replace_one_planet_by_id(planet_id):
+    request_body = request.get_json()
+    planet = get_planet_by_id(planet_id)
+
+
+    planet.name = request_body["name"]
+    planet.description = request_body["description"]
+    planet.has_moon = request_body["has_moon"]
+
+    db.session.commit()
+
+
+    return make_response(f"Planet {planet.id} successfully updated"), 200
+
+
+#update part of one existing planet
+@bp.route("<planet_id>", methods=["PATCH"])
+def update_planet_by_id(planet_id):
+    request_body = request.get_json()
+    planet = get_planet_by_id(planet_id)
+
+    planet_keys = request_body.keys()
+
+    if "name" in planet_keys:
+        planet.name = request_body["name"]
+    if "description" in planet_keys:
+        planet.description = request_body["description"]
+    if "has_moon" in planet_keys:
+        planet.has_moon = request_body["has_moon"]
+
+    db.session.commit()
+
+    return make_response(f"Planet {planet.id} successfully updated"), 200
+
+#delete record of planet
+@bp.route("/<planet_id>", methods=["DELETE"])
+def delete_planet(planet_id):
+    planet = get_planet_by_id(planet_id)
+
+    db.session.delete(planet)
+    db.session.commit()
+
+    return make_response(f"Planet #{planet.id} successfully deleted")
+
+    
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..2500aa1bc
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Generic single-database configuration.
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..1333c6c79
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,53 @@
+# 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,flask_migrate
+keys = root,sqlalchemy,alembic
+>>>>>>> 5952d2681d2751f9f45eb2cf8657682d11f7f463
+
+[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
+
+<<<<<<< HEAD
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[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/1e71069e2045_added_planet_model.py b/migrations/versions/1e71069e2045_added_planet_model.py
new file mode 100644
index 000000000..a45191e2b
--- /dev/null
+++ b/migrations/versions/1e71069e2045_added_planet_model.py
@@ -0,0 +1,34 @@
+"""added Planet model
+
+Revision ID: 1e71069e2045
+Revises: 
+Create Date: 2022-04-29 11:25:53.178782
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1e71069e2045'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('planet',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('has_mooon', sa.Boolean(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('planet')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/46eb1a9e810f_check.py b/migrations/versions/46eb1a9e810f_check.py
new file mode 100644
index 000000000..cdc675d8a
--- /dev/null
+++ b/migrations/versions/46eb1a9e810f_check.py
@@ -0,0 +1,34 @@
+"""check
+
+Revision ID: 46eb1a9e810f
+Revises: 7e79df43c700
+Create Date: 2022-05-06 05:06:22.867657
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '46eb1a9e810f'
+down_revision = '7e79df43c700'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('planet',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('has_moon', sa.Boolean(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('planet')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/5662cea0f0b3_renamed_has_moon.py b/migrations/versions/5662cea0f0b3_renamed_has_moon.py
new file mode 100644
index 000000000..8c231031a
--- /dev/null
+++ b/migrations/versions/5662cea0f0b3_renamed_has_moon.py
@@ -0,0 +1,30 @@
+"""renamed has_moon
+
+Revision ID: 5662cea0f0b3
+Revises: 1e71069e2045
+Create Date: 2022-05-02 16:56:58.711477
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '5662cea0f0b3'
+down_revision = '1e71069e2045'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('planet', sa.Column('has_moon', sa.Boolean(), nullable=True))
+    op.drop_column('planet', 'has_mooon')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('planet', sa.Column('has_mooon', sa.BOOLEAN(), autoincrement=False, nullable=True))
+    op.drop_column('planet', 'has_moon')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/7e79df43c700_adds_planet_model.py b/migrations/versions/7e79df43c700_adds_planet_model.py
new file mode 100644
index 000000000..646ac787f
--- /dev/null
+++ b/migrations/versions/7e79df43c700_adds_planet_model.py
@@ -0,0 +1,34 @@
+"""adds Planet model
+
+Revision ID: 7e79df43c700
+Revises: 
+Create Date: 2022-04-30 01:40:47.999164
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7e79df43c700'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('planet',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('has_moon', sa.Boolean(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('planet')
+    # ### end Alembic commands ###
diff --git a/project-directions/wave_06.md b/project-directions/wave_06.md
index 7d854f465..9da0a4524 100644
--- a/project-directions/wave_06.md
+++ b/project-directions/wave_06.md
@@ -30,7 +30,8 @@ Create test fixtures and unit tests for the following test cases:
 
 ## Code Coverage
 
-Check your code coverage using `pytest-cov`. Review the [code coverage exercise](https://github.com/adaGold/code-coverage-exercise) on how to use `pytest-cov` to generate a code coverage report. We will need to change the directory where the application code is located from `student` to `app`.
+Check your code coverage using `pytest-cov`. Review the [code coverage exercise](pip install -r requirements.txt
+) on how to use `pytest-cov` to generate a code coverage report. We will need to change the directory where the application code is located from `student` to `app`.
 
 `pytest --cov=app --cov-report html --cov-report term`
 
diff --git a/requirements.txt b/requirements.txt
index a506b4d12..b13ff01fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 alembic==1.5.4
+attrs==20.3.0
 autopep8==1.5.5
 blinker==1.4
 certifi==2020.12.5
@@ -7,15 +8,20 @@ click==7.1.2
 Flask==1.1.2
 Flask-Migrate==2.6.0
 Flask-SQLAlchemy==2.4.4
+gunicorn==20.1.0
 idna==2.10
+iniconfig==1.1.1
 itsdangerous==1.1.0
 Jinja2==2.11.3
 Mako==1.1.4
 MarkupSafe==1.1.1
+packaging==20.9
+pluggy==0.13.1
 psycopg2-binary==2.8.6
+py==1.10.0
 pycodestyle==2.6.0
+pyparsing==2.4.7
 pytest==6.2.3
-pytest-cov==2.12.1
 python-dateutil==2.8.1
 python-dotenv==0.15.0
 python-editor==1.0.4
@@ -25,3 +31,5 @@ SQLAlchemy==1.3.23
 toml==0.10.2
 urllib3==1.26.4
 Werkzeug==1.0.1
+Werkzeug==1.0.1
+
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/conftest.py b/test/conftest.py
new file mode 100644
index 000000000..9af18f885
--- /dev/null
+++ b/test/conftest.py
@@ -0,0 +1,44 @@
+import pytest
+from app import create_app
+from app import db
+from flask.signals import request_finished
+from app.models.planet import Planet 
+
+
+@pytest.fixture
+def app():
+    app = create_app({"TESTING": True})
+
+    @request_finished.connect_via(app)
+    def expire_session(sender, response, **extra):
+        db.session.remove()
+
+    with app.app_context():
+        db.create_all()
+        yield app
+
+    with app.app_context():
+        db.drop_all()
+
+
+@pytest.fixture
+def client(app):
+    return app.test_client()
+
+
+@pytest.fixture
+def two_saved_planets(app):
+    # Arrange
+    venus_planet = Planet(name="Venus",
+                      description="watr 4evr", 
+                      has_moon = False)
+
+    love_planet = Planet(name="Love",
+                         description="i luv 2 climb rocks", 
+                         has_moon = True)
+
+    db.session.add_all([venus_planet, love_planet])
+    # Alternatively, we could do
+    # db.session.add(ocean_book)
+    # db.session.add(mountain_book)
+    db.session.commit()
\ No newline at end of file
diff --git a/test/test_fixture.py b/test/test_fixture.py
new file mode 100644
index 000000000..ca9468414
--- /dev/null
+++ b/test/test_fixture.py
@@ -0,0 +1,43 @@
+import pytest 
+
+@pytest.fixture 
+def empty_list():
+    return []
+
+def test_len_of_empty(empty_list):
+    assert isinstance(empty_list,list)
+    assert len(empty_list) == 0 
+
+@pytest.fixture
+def one_item(empty_list):
+    empty_list.append("item")
+    return empty_list
+
+def test_len_of_unary_list(one_item):
+    assert isinstance(one_item, list)
+    assert len(one_item) == 1
+    assert one_item[0] == "item"
+
+class FancyObject:
+    def __init__(self):
+        self.fancy = True
+        print(f"\nFancyObject: {self.fancy}")
+
+    def or_is_it(self):
+        self.fancy = not self.fancy
+
+    def cleanup(self):
+        print(f"\ncleanup: {self.fancy}")
+
+@pytest.fixture
+def so_fancy():
+    fancy_object = FancyObject()
+
+    yield fancy_object
+
+    fancy_object.cleanup()
+
+def test_so_fancy(so_fancy):
+    assert so_fancy.fancy
+    so_fancy.or_is_it()
+    assert not so_fancy.fancy
\ No newline at end of file
diff --git a/test/test_route.py b/test/test_route.py
new file mode 100644
index 000000000..b921d3a13
--- /dev/null
+++ b/test/test_route.py
@@ -0,0 +1,55 @@
+
+
+import json
+
+
+def test_get_all_planets_with_no_records(client):
+    # Act
+    response = client.get("/planets")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == []
+
+
+def test_get_one_planet_by_id(client, two_saved_planets):
+    # Act
+    response = client.get("/planets/1")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == {
+        "id": 1,
+        "name": "Venus",
+        "description": "watr 4evr",
+        "has_moon": False
+    }
+
+
+
+def test_get_one_nonexistent_planet_returns_404(client, two_saved_planets):
+    # Act
+    response = client.get("/planets/8")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 404
+    assert response_body == {
+       "details" : 'Invalid id 8'
+    }
+
+def test_create_one_planet(client):
+
+    response = client.post("/planets", json={
+        "name": "Uros",
+        "description": "new",
+        "has_moon": True
+    })
+
+    response_body = response.get_data(as_text=True)
+
+    #assert 
+    assert response.status_code== 201
+    assert response_body== "Planet Uros successfully created"
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 000000000..40e0b0485
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,43 @@
+import pytest
+from flask import request_finished
+from app import create_app, db
+from app.models.planet import Planet
+
+@pytest.fixture
+def app():
+    app = create_app({"TESTING": True})
+
+    @request_finished.connect_via(app)
+    def expire_session(sender, response, **extra):
+        db.session.remove()
+
+    #make sure we have everything we need and yield app
+    with app.app_context():
+        db.create_all()
+        yield app
+
+    #this will clean everything up
+    with app.app_context():
+        db.drop_all()
+
+
+@pytest.fixture
+def client(app):
+    return app.test_client()
+
+
+
+
+@pytest.fixture
+def two_saved_planets(app):
+    # Arrange
+    mars_planet = Planet(name="mars",
+                      description="watr 4evr", has_moon=True)
+    venus_planet = Planet(name="venus",
+                         description="i luv 2 climb rocks", has_moon=True)
+
+    db.session.add_all([mars_planet, venus_planet])
+    # Alternatively, we could do
+    # db.session.add(ocean_book)
+    # db.session.add(mountain_book)
+    db.session.commit
diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
new file mode 100644
index 000000000..5348ddf32
--- /dev/null
+++ b/tests/test_fixtures.py
@@ -0,0 +1,47 @@
+import pytest
+
+#decorator to designate a function as a fixture -shared code used to perform setup and cleanup for tests
+#@pytest.fixture
+
+@pytest.fixture
+def empty_list():
+    return []
+
+def test_len_of_empty_list(empty_list):
+    assert isinstance(empty_list, list)
+    assert len(empty_list) == 0
+
+@pytest.fixture
+def one_item(empty_list):
+    empty_list.append("item")
+    return empty_list
+
+def test_len_of_unary_list(one_item):
+    assert isinstance(one_item, list)
+    assert len(one_item) == 1
+    assert one_item[0] == "item"
+
+class FancyObject:
+    def __init__(self):
+        self.fancy = True
+        print(f"\nFancyObject: {self.fancy}")
+
+    def or_is_it(self):
+        self.fancy = not self.fancy
+
+    def cleanup(self):
+        print(f"\ncleanup: {self.fancy}")
+
+@pytest.fixture
+def so_fancy():
+    fancy_object = FancyObject()
+
+    yield fancy_object
+
+    fancy_object.cleanup()
+
+def test_so_fancy(so_fancy):
+    assert so_fancy.fancy
+    so_fancy.or_is_it()
+    assert not so_fancy.fancy
+
diff --git a/tests/test_routes.py b/tests/test_routes.py
new file mode 100644
index 000000000..fcd4c51d4
--- /dev/null
+++ b/tests/test_routes.py
@@ -0,0 +1,53 @@
+
+#test get all palnets returns a 200 with an array including appropriate test data
+def test_get_all_planets_with_empty_db_return_empty_list(client):
+    response = client.get("/planets")
+
+    response_body = response.get_json()
+
+    assert response.status_code == 200
+    assert response_body == []
+
+#test returns a reponse body that matches our fixture for planet id  
+def test_get_one_planet_by_id(client, two_saved_planets):
+    # Act
+    response = client.get("/planets/1")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == {
+        "id": 1,
+        "name": "mars",
+        "description": "watr 4evr",
+        "has_moon": True
+    }
+
+#test that no data in test returns 404 for planet id
+def test_no_data_in_test_db_returns_404(client, two_saved_planets):
+    # Act
+    response = client.get("/planets/3")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 404
+    assert response_body == {
+       "details" : 'Invalid id 3'
+    }
+    
+#create planet by id with JSON request body returns a 201
+def test_create_one_planet(client):
+    # Act
+    response = client.post("/planets", json={
+        "name": "Neptune",
+        "description": "Gaseous",
+        "has_moon" : True
+    })
+    response_body = response.get_data(as_text=True)
+
+    # Assert
+    assert response.status_code == 201
+    assert response_body == "Planet Neptune successfully created"
+
+
+