diff --git a/.gitignore b/.gitignore
index 4e9b18359..db601f26e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .vscode
 .DS_Store
+.env
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
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 70b4cabfe..3302fe29e 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,7 +1,33 @@
 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()
 
 
 def create_app(test_config=None):
     app = Flask(__name__)
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    
+    if test_config:
+        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_TEST_DATABASE_URI")
+        app.config["Testing"] = True
+    else:
+        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("SQLALCHEMY_DATABASE_URI")
+    
+    db.init_app(app)
+    migrate.init_app(app, db)
+
+    from app.models.planet import Planet
 
+    from .planet_routes import planets_bp
+    app.register_blueprint(planets_bp)
+
+    from .moon_routes import moons_bp
+    app.register_blueprint(moons_bp)
     return app
+
diff --git a/app/models/__init__.py b/app/models/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/models/moon.py b/app/models/moon.py
new file mode 100644
index 000000000..a01b2798a
--- /dev/null
+++ b/app/models/moon.py
@@ -0,0 +1,26 @@
+from app import db
+
+class Moon(db.Model):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    name = db.Column(db.String, nullable=False)
+    size = db.Column(db.String, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    planet_id = db.Column(db.Integer, db.ForeignKey("planet.id"))
+    planet = db.relationship("Planet", back_populates="moons")
+    
+    def to_dict(self):
+        moon_dict = {}
+        moon_dict["id"] = self.id
+        moon_dict["name"] = self.name
+        moon_dict["size"] = self.size
+        moon_dict["description"] = self.description
+        return moon_dict
+
+    @classmethod
+    def from_dict(cls, moon_data):
+        new_moon = Moon(
+            name = moon_data["name"],
+            size = moon_data["size"],
+            description = moon_data["description"]
+        )
+        return new_moon
\ No newline at end of file
diff --git a/app/models/planet.py b/app/models/planet.py
new file mode 100644
index 000000000..0e94a5a11
--- /dev/null
+++ b/app/models/planet.py
@@ -0,0 +1,36 @@
+from app import db
+
+class Planet(db.Model):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    name = db.Column(db.String)
+    description = db.Column(db.String)
+    radius = db.Column(db.Float)
+    num_moons = db.Column(db.Float)
+    gravity = db.Column(db.Float)
+    moons = db.relationship("Moon", back_populates="planet")
+
+    def to_dict(self):
+        planet_dict = {}
+        planet_dict["id"] = self.id
+        planet_dict["name"] = self.name
+        planet_dict["description"] = self.description
+        planet_dict["radius"] = self.radius
+        planet_dict["num_moons"] = self.num_moons
+        planet_dict["gravity"] = self.gravity
+
+        moon_names = []
+        for moon in self.moons:
+            moon_names.append(moon.name)
+        planet_dict["moon"] = moon_names
+        return planet_dict
+
+    @classmethod
+    def from_dict(cls, planet_data):
+        new_planet = Planet(name=planet_data["name"],
+                    description=planet_data["description"],
+                    radius=planet_data["radius"],
+                    num_moons=planet_data["num_moons"],
+                    gravity=planet_data["gravity"]
+                    )
+        return new_planet
+
diff --git a/app/moon_routes.py b/app/moon_routes.py
new file mode 100644
index 000000000..f1a8ce6fe
--- /dev/null
+++ b/app/moon_routes.py
@@ -0,0 +1,66 @@
+from app import db
+from app.models.moon import Moon
+from app.planet_routes import validate_model
+from flask import Blueprint, jsonify, make_response, request
+
+moons_bp = Blueprint("moons_bp", __name__, url_prefix="/moons")
+
+@moons_bp.route("", methods=["POST"])
+def create_moon():
+    moon_data = request.get_json()
+    new_moon = Moon.from_dict(moon_data)
+
+    db.session.add(new_moon)
+    db.session.commit()
+
+    return make_response(f"Moon {new_moon.name} created", 201)
+
+@moons_bp.route("", methods=["GET"])  
+def get_moons_optional_query():
+    moon_query = Moon.query
+
+    name_query = request.args.get("name")
+    if name_query:
+        moon_query = moon_query.filter(Moon.name.ilike(f"%{name_query}%"))
+
+    sort_query = request.args.get("sort")
+    if sort_query:
+        if sort_query == "desc":
+            moon_query = moon_query.order_by(Moon.size.desc())
+        else:
+            moon_query = moon_query.order_by(Moon.size.asc())
+
+    moons = moon_query.all()
+    moon_response = []
+    for moon in moons:
+        moon_response.append(moon.to_dict())
+
+    return jsonify(moon_response)
+
+@moons_bp.route("/<moon_id>", methods=["GET"])
+def get_moon_by_id(moon_id):
+    moon_to_return = validate_model(Moon, moon_id)
+
+    return jsonify(moon_to_return.to_dict())
+
+@moons_bp.route("/<moon_id>", methods=["PUT"])
+def replace_moon_with_id(moon_id):
+    moon_data = request.get_json()
+    moon_to_update = validate_model(Moon, moon_id)
+
+    moon_to_update.name = moon_data["name"],
+    moon_to_update.size = moon_data["size"],
+    moon_to_update.description = moon_data["description"],
+
+    db.session.commit()
+
+    return make_response(f"Moon {moon_to_update.name} updated", 200)
+
+@moons_bp.route("/<moon_id>", methods=["DELETE"])
+def delete_moons_by_id(moon_id):
+    moon_to_delete = validate_model(Moon, moon_id)
+    db.session.delete(moon_to_delete)
+    db.session.commit()
+
+    return make_response(f"Moon {moon_to_delete.name} deleted", 200)
+
diff --git a/app/planet_routes.py b/app/planet_routes.py
new file mode 100644
index 000000000..be87a77ce
--- /dev/null
+++ b/app/planet_routes.py
@@ -0,0 +1,109 @@
+from app import db
+from app.models.planet import Planet
+from flask import Blueprint, jsonify, abort, make_response, request 
+from app.models.moon import Moon
+
+
+planets_bp = Blueprint("planets_bp", __name__, url_prefix="/planets")
+
+
+@planets_bp.route("", methods=["POST"])
+def create_planet():
+    request_body = request.get_json()
+    new_planet = Planet.from_dict(request_body)
+
+    db.session.add(new_planet)
+    db.session.commit()
+
+    return make_response(f"Planet {new_planet.name} successfully created", 201)
+
+@planets_bp.route("", methods=["GET"])
+def read_all_planets():
+    planet_query = Planet.query
+    name_query = request.args.get("name")
+    if name_query:
+        planet_query = planet_query.filter(Planet.name.ilike(f"%{name_query}%"))
+        
+    sort_query = request.args.get("sort")
+    if sort_query:
+        if sort_query == "desc":
+            planet_query = planet_query.order_by(Planet.name.desc())
+        else:
+            planet_query = planet_query.order_by(Planet.name.asc())
+
+    planets = planet_query.all()
+    planets_response = []
+    for planet in planets:
+        planets_response.append(planet.to_dict())
+    return jsonify(planets_response)
+
+def validate_model(cls, model_id):
+    try:
+        model_id = int(model_id)
+    except:
+        abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400))
+
+    model = cls.query.get(model_id)
+    
+    if not model:
+        abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404))
+    
+    return model
+
+@planets_bp.route("/<planet_id>", methods=["GET"])
+def read_one_planet(planet_id):
+    planet = validate_model(Planet, planet_id)
+    return planet.to_dict()
+
+@planets_bp.route("/<planet_id>", methods=["PUT"])
+def update_planet(planet_id):
+    planet = validate_model(Planet, planet_id)
+
+    request_body = request.get_json()
+    # new_planet = Planet.from_dict(request_body)
+
+    planet.name = request_body["name"]
+    planet.description = request_body["description"]
+    planet.radius = request_body["radius"]
+    planet.num_moons = request_body["num_moons"]
+    planet.gravity = request_body["gravity"]
+
+    db.session.commit()
+    # new_planet = Planet.from_dict(request_body)
+    return make_response(f"Planet #{planet.id} successfully updated")
+
+
+@planets_bp.route("/<planet_id>", methods=["DELETE"])
+def delete_planet(planet_id):
+    planet = validate_model(Planet, planet_id)
+
+    db.session.delete(planet)
+    db.session.commit()
+
+    return make_response(f"Planet #{planet.id} successfully deleted")
+
+
+@planets_bp.route("/<planet_id>/moons", methods=["POST"])
+def add_new_moon_to_planet(planet_id):
+    planet = validate_model(Planet, planet_id)
+
+    request_body = request.get_json()
+    new_moon = Moon.from_dict(request_body)
+    new_moon.planet = planet
+
+    db.session.add(new_moon)
+    db.session.commit()
+
+    message = f"Moon {new_moon.name} created with Planet{planet.name}"
+    return make_response(jsonify(message), 201)
+
+@planets_bp.route("/<planet_id>/moons", methods=["GET"])
+def get_all_moons_for_planet(planet_id):
+    planet = validate_model(Planet, planet_id)
+
+    moons_response = []
+    for moon in planet.moons:
+        moons_response.append(moon.to_dict())
+
+    return jsonify(moons_response)
+
diff --git a/app/routes.py b/app/routes.py
deleted file mode 100644
index 8e9dfe684..000000000
--- a/app/routes.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from flask import Blueprint
-
diff --git a/coworking_agreement.md b/coworking_agreement.md
index 463598c27..7648181d0 100644
--- a/coworking_agreement.md
+++ b/coworking_agreement.md
@@ -21,5 +21,5 @@ Talk through each section with your partner. Add notes on what you discussed and
 *Other co-working agreements that were not captured in the above sections.*
 
 ## Signatures
-______________ _______________
-Date: _________
+_Supriya Chavan_ __Diana Arreola________
+Date: 12/14/2023
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/24c23c9197c9_.py b/migrations/versions/24c23c9197c9_.py
new file mode 100644
index 000000000..9ec66440c
--- /dev/null
+++ b/migrations/versions/24c23c9197c9_.py
@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: 24c23c9197c9
+Revises: abe0497758b8
+Create Date: 2023-01-05 11:25:18.625903
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '24c23c9197c9'
+down_revision = 'abe0497758b8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('moon',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('size', sa.String(), nullable=False),
+    sa.Column('description', sa.String(), nullable=False),
+    sa.Column('planet_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['planet_id'], ['planet.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('moon')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/abe0497758b8_adds_planet_model.py b/migrations/versions/abe0497758b8_adds_planet_model.py
new file mode 100644
index 000000000..9df4e169e
--- /dev/null
+++ b/migrations/versions/abe0497758b8_adds_planet_model.py
@@ -0,0 +1,36 @@
+"""adds planet Model
+
+Revision ID: abe0497758b8
+Revises: 
+Create Date: 2022-12-20 11:15:16.245571
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'abe0497758b8'
+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=True),
+    sa.Column('description', sa.String(), nullable=True),
+    sa.Column('radius', sa.Float(), nullable=True),
+    sa.Column('num_moons', sa.Float(), nullable=True),
+    sa.Column('gravity', sa.Float(), 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/requirements.txt b/requirements.txt
index fba2b3e38..1783ca42f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,27 @@
 alembic==1.5.4
+attrs==21.2.0
 autopep8==1.5.5
 blinker==1.4
 certifi==2020.12.5
 chardet==4.0.0
 click==7.1.2
+coverage==6.5.0
 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==21.2
+pluggy==1.0.0
 psycopg2-binary==2.9.4
+py==1.10.0
 pycodestyle==2.6.0
+pyparsing==2.4.7
 pytest==7.1.1
 pytest-cov==2.12.1
 python-dateutil==2.8.1
@@ -23,5 +31,6 @@ requests==2.25.1
 six==1.15.0
 SQLAlchemy==1.3.23
 toml==0.10.2
-urllib3==1.26.4
+tomli==2.0.1
+urllib3==1.26.5
 Werkzeug==1.0.1
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..2f8780f9f
--- /dev/null
+++ b/tests/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
+    mars = Planet(name="Mars",
+                    description="War planet",
+                    radius=2106.1,
+                    num_moons=2,
+                    gravity=3.721)
+    venus = Planet(name="Venus",
+                    description="Planet Of Love",
+                    radius=3760.4,
+                    num_moons=1,
+                    gravity=8.874)
+
+    db.session.add_all([mars, venus])
+    db.session.commit()
diff --git a/tests/test_model.py b/tests/test_model.py
new file mode 100644
index 000000000..ec33a84c1
--- /dev/null
+++ b/tests/test_model.py
@@ -0,0 +1,216 @@
+from app.planet_routes import Planet
+import pytest
+
+def test_to_dict_no_missing_data():
+    # Arrange
+    test_data = Planet(id = 1,
+                    name="Mars",
+                    description="watr 4evr",
+                    radius=2106.1,
+                    num_moons=2,
+                    gravity=3.721
+                    )
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 1
+    assert result["name"] == "Mars"
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] == 2
+    assert result["gravity"] == 3.721
+
+
+def test_to_dict_missing_id():
+    # Arrange
+    test_data = Planet(name="Mars",
+                    description="watr 4evr",
+                    radius=2106.1,
+                    num_moons=2,
+                    gravity=3.721
+                    )
+
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] is None
+    assert result["name"] == "Mars"
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] == 2
+    assert result["gravity"] == 3.721
+
+def test_to_dict_missing_name():
+    # Arrange
+    test_data = Planet(id=1,
+                    description="watr 4evr",
+                    radius=2106.1,
+                    num_moons=2,
+                    gravity=3.721
+                    )
+
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 1
+    assert result["name"] is None
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] == 2
+    assert result["gravity"] == 3.721
+
+def test_to_dict_missing_description():
+    # Arrange
+    test_data = Planet(id=2,
+                    name="Mars",
+                    radius=2106.1,
+                    num_moons=2,
+                    gravity=3.721
+                    )
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 2
+    assert result["name"] == "Mars"
+    assert result["description"] is None
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] == 2
+    assert result["gravity"] == 3.721
+
+def test_to_dict_missing_radius():
+    # Arrange
+    test_data = Planet(id=2,
+                    name="Mars",
+                    description="watr 4evr",
+                    num_moons=2,
+                    gravity=3.721
+                    )
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 2
+    assert result["name"] == "Mars"
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] is None
+    assert result["num_moons"] == 2
+    assert result["gravity"] == 3.721
+
+def test_to_dict_missing_number_of_moons():
+    # Arrange
+    test_data = Planet(id=2,
+                    name="Mars",
+                    description="watr 4evr",
+                    radius=2106.1,
+                    gravity=3.721
+                    )
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 2
+    assert result["name"] == "Mars"
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] is None
+    assert result["gravity"] == 3.721
+
+def test_to_dict_missing_gravity():
+    # Arrange
+    test_data = Planet(id=2,
+                    description="watr 4evr",
+                    name="Mars",
+                    radius=2106.1,
+                    num_moons=2,
+                    )
+    # Act
+    result = test_data.to_dict()
+
+    # Assert
+    assert len(result) == 7
+    assert result["id"] == 2
+    assert result["name"] == "Mars"
+    assert result["description"] == "watr 4evr"
+    assert result["radius"] == 2106.1
+    assert result["num_moons"] == 2
+    assert result["gravity"] is None
+
+# from_dict tests
+
+def test_from_dict_returns_planet():
+    # Arrange
+    planet_data = {
+                    "name": "Mars",
+                    "description": "watr 4evr",
+                    "radius": 2106.1,
+                    "num_moons": 2,
+                    "gravity": 3.721
+                }
+    
+    # Act
+    result = Planet.from_dict(planet_data)
+
+    # Assert
+    assert result.name == "Mars"
+    assert result.description == "watr 4evr"
+    assert result.radius == 2106.1
+    assert result.num_moons == 2
+    assert result.gravity == 3.721
+
+def test_from_dict_with_no_name():
+    # Arrange
+    planet_data = {
+                    "description": "watr 4evr",
+                    "radius": 2106.1,
+                    "num_moons": 2,
+                    "gravity": 3.721
+                }
+
+    # Act & Assert
+    with pytest.raises(KeyError, match = 'name'):
+        result = Planet.from_dict(planet_data)
+
+
+def test_from_dict_with_no_description():
+    # Arrange
+    planet_data = {
+        "name": "Mars",
+        "radius": 2106.1,
+        "num_moons": 2,
+        "gravity": 3.721
+    }
+
+    # Act & Assert
+    with pytest.raises(KeyError, match = 'description'):
+        result = Planet.from_dict(planet_data)
+
+def test_from_dict_with_extra_keys():
+    # Arrange
+    planet_data = {
+        "name": "Mars",
+        "description": "watr 4evr",
+        "radius": 2106.1,
+        "num_moons": 2,
+        "gravity": 3.721,
+        "extra": "new stuff"
+    }
+    
+    # Act
+    result = Planet.from_dict(planet_data)
+
+    # Assert
+    assert result.name == "Mars"
+    assert result.description == "watr 4evr"
+    assert result.radius == 2106.1
+    assert result.num_moons == 2
+    assert result.gravity == 3.721
diff --git a/tests/test_routes.py b/tests/test_routes.py
new file mode 100644
index 000000000..b2f9dcda4
--- /dev/null
+++ b/tests/test_routes.py
@@ -0,0 +1,208 @@
+from werkzeug.exceptions import HTTPException
+from app.planet_routes import validate_model
+from app.models.planet import Planet
+import pytest
+
+def test_get_planets_empty_db_returns_empty_list(client):
+    # Act
+    response = client.get("/planets")
+
+    # Assert 
+    assert response.status_code == 200
+    assert response.get_json() == []
+
+def test_get_planet_with_id_empty_db_returns_404(client):
+    # Act
+    response = client.get("/planets/100")
+
+    # Assert 
+    assert response.status_code == 404
+    assert response.get_json() == {"message":f"Planet 100 not found"}
+
+def test_get_planets_optional_query_returns_seeded_planets(client, two_saved_planets):
+    response = client.get("/planets")
+
+    assert response.status_code == 200
+    planet_list = response.get_json()
+    assert len(planet_list) == 2
+    assert planet_list[0]["id"] == 1
+    assert planet_list[0]["name"] == "Mars"
+    assert planet_list[0]["description"] == "War planet"
+    assert planet_list[0]["radius"] ==  2106.1
+    assert planet_list[0]["num_moons"] == 2
+    assert planet_list[0]["gravity"] == 3.721
+    
+    assert planet_list[1]["id"] == 2
+    assert planet_list[1]["name"] == "Venus"
+    assert planet_list[1]["description"] == "Planet Of Love"
+    assert planet_list[1]["radius"] ==  3760.4
+    assert planet_list[1]["num_moons"] == 1
+    assert planet_list[1]["gravity"] == 8.874
+
+def test_get_one_planet_with_name_param_asc_sort(client, two_saved_planets):
+    response = client.get("/planets?name=Mars&sort=asc") 
+
+    assert response.status_code == 200
+    planet_list = response.get_json()
+    assert len(planet_list) == 1
+    assert planet_list[0]["id"] == 1
+    assert planet_list[0]["name"] == "Mars"
+    assert planet_list[0]["description"] == "War planet"
+    assert planet_list[0]["radius"] ==  2106.1
+    assert planet_list[0]["num_moons"] == 2
+    assert planet_list[0]["gravity"] == 3.721
+
+def test_get_one_planet_with_name_param_desc_sort(client, two_saved_planets):
+    response = client.get("/planets?name=Venus&sort=desc") 
+
+    assert response.status_code == 200
+    planet_list = response.get_json()
+    assert len(planet_list) == 1
+    assert planet_list[0]["id"] == 2
+    assert planet_list[0]["name"] == "Venus"
+    assert planet_list[0]["description"] == "Planet Of Love"
+    assert planet_list[0]["radius"] ==  3760.4
+    assert planet_list[0]["num_moons"] == 1
+    assert planet_list[0]["gravity"] == 8.874
+
+def test_get_one_planet_by_id(client, two_saved_planets):
+    response = client.get("/planets/2") 
+
+    assert response.status_code == 200
+    planet_list = response.get_json()
+    assert planet_list["id"] == 2
+    assert planet_list["name"] == "Venus"
+    assert planet_list["description"] == "Planet Of Love"
+    assert planet_list["radius"] ==  3760.4
+    assert planet_list["num_moons"] == 1
+    assert planet_list["gravity"] == 8.874
+
+def test_create_one_planet(client):
+    # Act
+    response = client.post("/planets", json={
+        "name": "Pluto",
+        "description": "like the dog",
+        "radius": 10000,
+        "num_moons": 123,
+        "gravity": 1234
+    })
+    response_body = response.get_data(as_text=True)
+
+    # Assert
+    assert response.status_code == 201
+    assert response_body == "Planet Pluto successfully created"
+
+def test_delete_one_planet(client, two_saved_planets):
+    # Act
+    response = client.delete("/planets/1")
+    response_body = response.get_data(as_text=True)
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == "Planet #1 successfully deleted"
+
+
+def test_does_not_delete_planet_with_invalid_id(client, two_saved_planets):
+    # Act
+    response = client.delete("/planets/helloworld")
+
+    # Assert
+    assert response.status_code == 400
+    assert response.get_json() == {"message": f"Planet helloworld invalid"}
+
+def test_does_not_delete_planet_with_nonexistent_id(client, two_saved_planets):
+    # Act
+    response = client.delete("/planets/100")
+
+    # Assert
+    assert response.status_code == 404
+    assert response.get_json() == {"message":f"Planet 100 not found"}
+
+
+def test_does_not_update_one_planet_with_invalid_id(client, two_saved_planets):
+    # Act
+    response = client.put("/planets/helloworld", json={
+        "name": "Jupiter",
+        "description": "Planet Of Luck",
+        "radius": 43441,
+        "num_moons":80,
+        "gravity": 24.79
+    })
+
+    # Assert
+    assert response.status_code == 400
+    assert response.get_json() == {"message":f"Planet helloworld invalid"}
+
+def test_does_not_update_one_planet_with_nonexistent_id(client, two_saved_planets):
+    # Act
+    response = client.put("/planets/300", json={
+        "name": "Jupiter",
+        "description": "Planet Of Luck",
+        "radius": 43441,
+        "num_moons":80,
+        "gravity": 24.79
+    })
+
+    # Assert
+    assert response.status_code == 404
+    assert response.get_json() == {"message":f"Planet 300 not found"}
+
+def test_update_one_planet(client, two_saved_planets):
+    # Act
+    response = client.put("/planets/2", json={
+        "name": "Jupiter",
+        "description": "Planet Of Luck",
+        "radius": 43441,
+        "num_moons":80,
+        "gravity": 24.79
+    })
+    response_body = response.get_data(as_text=True)
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == "Planet #2 successfully updated"
+
+def test_update_planet_with_extra_keys(client, two_saved_planets):
+    # Arrange
+    planet_data = {
+        "extra": "some stuff",
+        "name": "Jupiter",
+        "description": "Planet Of Luck",
+        "radius": 43441,
+        "num_moons":80,
+        "gravity": 24.79
+    }
+
+    # Act
+    response = client.put("/planets/1", json=planet_data)
+    response_body = response.get_data(as_text=True)
+
+    # Assert
+    assert response.status_code == 200
+    assert response_body == "Planet #1 successfully updated"
+
+def test_validate_model(two_saved_planets):
+    # Act
+    result_planet = validate_model(Planet, 2)
+
+    # Assert
+    assert result_planet.id == 2
+    assert result_planet.name == "Venus"
+    assert result_planet.description == "Planet Of Love"
+    assert result_planet.radius ==  3760.4
+    assert result_planet.num_moons == 1
+    assert result_planet.gravity == 8.874
+
+def test_validate_model_missing_id(two_saved_planets):
+    # Act & Assert
+    # Calling `validate_book` without being invoked by a route will
+    # cause an `HTTPException` when an `abort` statement is reached 
+    with pytest.raises(HTTPException):
+        result_planet = validate_model(Planet, "3")
+    
+def test_validate_model_invalid_id(two_saved_planets):
+    # Act & Assert
+    # Calling `validate_book` without being invoked by a route will
+    # cause an `HTTPException` when an `abort` statement is reached 
+    with pytest.raises(HTTPException):
+        result_planet = validate_model(Planet, "helloworld")
\ No newline at end of file