diff --git a/main.rb b/main.rb
new file mode 100644
index 00000000..85fcc7bd
--- /dev/null
+++ b/main.rb
@@ -0,0 +1,55 @@
+require_relative "planet"
+require_relative "solar_system"
+
+def main
+  solar_system = SolarSystem.new("Sol")
+  earth = Planet.new("Earth", "blue-green", 5.972e24, 1.496e8, "Only planet known to support life")
+  solar_system.add_planet(earth)
+  venus = Planet.new("Venus", "green", 6.972e24, 2.496e8, "moody")
+  solar_system.add_planet(venus)
+  astra = Planet.new("Astra", "silver", 5, 23, "Marvel Universe planet")
+  solar_system.add_planet(astra)
+  ego = Planet.new("Ego", "green", 124234, 325623, "Marvel bioverse")
+  solar_system.add_planet(ego)
+  namek = Planet.new("Namek", "blue-green", 35435472, 23513541, "Dragon Ball world with lots of water and grass")
+  solar_system.add_planet(namek)
+
+  def wanna_add_planet()
+    puts "please add a planet: what is the planets name?"
+    name = gets.chomp
+    puts "and color?"
+    color = gets.chomp
+    puts "and mass?"
+    mass_kg = gets.chomp
+    puts "and distance from the sun?"
+    distance_from_sun_km = gets.chomp
+    puts "and please share a fun fact"
+    fun_fact = gets.chomp
+    planet = Planet.new(name, color, mass_kg, distance_from_sun_km, fun_fact)
+    return planet
+  end
+
+  loop do
+    puts "do you want to"
+    puts "1. list planets"
+    puts "2. planet details"
+    puts "3. add planet"
+    puts "4. exit"
+    answer = gets.chomp
+    if answer.to_i == 1 || answer == "list planets"
+      list = solar_system.list_planets
+      puts list
+    elsif answer.to_i == 2 || answer == "planet details"
+      puts "what planet do you want more info on"
+      planet = gets.chomp
+      found_planet = solar_system.find_planet_by_name(planet)
+      puts found_planet.summary
+    elsif answer.to_i == 3 || answer == "add planet"
+      solar_system.add_planet(wanna_add_planet())
+    else
+      break
+    end
+  end
+end
+
+main
diff --git a/planet.rb b/planet.rb
new file mode 100644
index 00000000..64f7db51
--- /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}: is #{color}, weighs #{mass_kg}, is #{distance_from_sun_km} km from the sun and #{fun_fact}"
+  end
+end
diff --git a/solar_system.rb b/solar_system.rb
new file mode 100644
index 00000000..7baf2b38
--- /dev/null
+++ b/solar_system.rb
@@ -0,0 +1,27 @@
+class SolarSystem
+  attr_reader :star_name, :planets
+
+  def initialize(star_name)
+    @star_name = star_name
+    @planets = []
+  end
+
+  def add_planet(planet)
+    @planets << planet
+  end
+
+  def list_planets()
+    planet_list = "Planets orbiting #{star_name}: \n"
+    @planets.each_with_index do |planet, i|
+      planet_list << "#{i + 1}: #{planet.name} \n"
+    end
+    return planet_list
+  end
+
+  def find_planet_by_name(planet_name)
+    found = @planets.find { |planet|
+      planet.name.upcase == planet_name.upcase
+    }
+    return found
+  end
+end