diff --git a/main.rb b/main.rb
new file mode 100644
index 00000000..0adc0aa6
--- /dev/null
+++ b/main.rb
@@ -0,0 +1,75 @@
+require_relative 'planet'
+require_relative 'solar_system'
+
+def main
+    # Our solar system
+    solar_system = SolarSystem.new('Sol')
+    # Planets: thanks to Emily Cowan for sharing her planets data!
+    earth = Planet.new('Earth', 'blue-green', 5.972e24, 1.496e8, 'Only planet known to support life')
+    pluto = Planet.new('Pluto', 'varied, grey-orange', 1.30900e22, 5.906e9, 'Named after the Roman god of the underworld')
+    mercury = Planet.new('Mercury', 'yellow-blue', 3.285e23, 5.791e7, 'Mercury is the fasest planet. Completing a full circle around the sun in 88 days')
+    venus = Planet.new('Venus', 'yellow', 4.867e24, 1.089e8, 'Venus is the hottest planet in our solar system')
+    mars = Planet.new('Mars', 'red', 6.39e23, 1.496e8, 'it is suspected that billions of years ago Mars was much warmer and had water')
+    jupiter = Planet.new('Jupiter', 'white and red', 1.898e27, 7.779e8, 'Jupiter is almost twice as large as any other planet in the solar system')
+    saturn = Planet.new('Saturn', 'yellow', 5.683e26, 1.433e9, 'Saturn has the largest and most complex rings of any planet in our solar system')
+    uranus = Planet.new('Uranus', 'light blue', 8.681e25, 2.877e9, 'Uranus rotates at an almost 90-degree angle from the plane of its orbit')
+    neptune = Planet.new('Neptune', 'blue', 1.024e26, 4.503e9, 'Neptune was the first planet located through mathematical calculations')
+    # Add planets to solar system
+    solar_system.add_planet(earth)
+    solar_system.add_planet(pluto)
+    solar_system.add_planet(mercury)
+    solar_system.add_planet(venus)
+    solar_system.add_planet(mars)
+    solar_system.add_planet(jupiter)
+    solar_system.add_planet(saturn)
+    solar_system.add_planet(uranus)
+    solar_system.add_planet(neptune)
+    
+    puts "Welcome. Please choose from the following options: \n"
+    options = "1: Add Planet \n2: Planet Details \n3: Exit \n"
+    puts options
+    # Start loop
+    while input = gets.chomp.downcase
+        if input == "3" || input == "exit"
+            break
+        elsif input == "1" || input == "add planet" 
+            # Add Planet
+            add_new_planet(solar_system)
+            puts "What would you like to do next?\n"
+            puts options
+        elsif input == "2" || input == "planet details"
+            # Planet Details
+            show_planet_details(solar_system)
+            puts "What would you like to do next?\n"
+            puts options
+        end   
+    end 
+end
+
+# Wave 3 method: Planet Details
+def show_planet_details(solar_system)
+    # show list of planets?
+    puts "Please enter planet's name:\n"
+    puts solar_system.list_planets
+    planet_name = gets.chomp
+    your_planet = solar_system.find_planet_by_name(planet_name)
+    puts your_planet.summary
+end
+
+# Wave 3 method: Add Planet
+def add_new_planet(solar_system)
+    puts "Please enter planet name:"
+    planet_name = gets.chomp.capitalize
+    puts "Please enter planet color:"
+    planet_color = gets.chomp
+    puts "Please enter planet mass"
+    planet_mass = gets.chomp
+    puts "Please enter planet's distance from the sun:"
+    planet_distance = gets.chomp
+    puts "Please enter a fun fact about this planet:"
+    planet_fact = gets.chomp
+    new_planet = Planet.new(planet_name, planet_color, planet_mass, planet_distance, planet_fact)
+    solar_system.add_planet(new_planet)
+end
+
+main
\ No newline at end of file
diff --git a/planet.rb b/planet.rb
new file mode 100644
index 00000000..1d4097e1
--- /dev/null
+++ b/planet.rb
@@ -0,0 +1,15 @@
+class Planet
+    attr_reader :name, :color, :mass_kg, :distance_from_sun_km, :fun_fact
+
+    def initialize(name, color, mass_kg, distance_from_sun_km, fun_fact)
+        @name = name
+        @color = color
+        @mass_kg = mass_kg
+        @distance_from_sun_km = distance_from_sun_km
+        @fun_fact = fun_fact
+    end
+
+    def summary
+        return "#{@name}: This planet is #{@color}-colored, is #{@mass_kg}kg,  and is #{@distance_from_sun_km}km from the sun. Fun fact: #{@fun_fact}.\n"
+    end
+end
\ No newline at end of file
diff --git a/solar_system.rb b/solar_system.rb
new file mode 100644
index 00000000..f6db2a00
--- /dev/null
+++ b/solar_system.rb
@@ -0,0 +1,38 @@
+class SolarSystem
+    attr_reader :star_name, :planets
+
+    def initialize(star_name)
+        @star_name = star_name
+        @planets = []
+    end
+
+    def add_planet(planet)
+        # take an instance of Planet as a parameter and add it to the list of planets.
+        planets << planet
+    end
+
+    def list_planets
+        # return string containing a list of all the planets in the system.
+        string = "Planets orbiting #{star_name}\n"
+        num = 0
+        planets.each do |item|
+            num +=1
+            string << "#{num}. #{item.name}\n"
+        end
+        return string
+    end
+
+    def find_planet_by_name(string)
+        # takes the name of a planet as a string, and returns the corresponding instance of Planet
+        string = string.downcase.capitalize
+        planets.each do |item|
+            if item.name == string
+                return item #.name
+            end
+        end
+        # cannot find planet scenario
+        if planets.include?(string) == false
+            return "Planet not found"
+        end
+    end
+end
\ No newline at end of file