diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..71bb84a3
Binary files /dev/null and b/.DS_Store differ
diff --git a/main.rb b/main.rb
new file mode 100644
index 00000000..1c68aabd
--- /dev/null
+++ b/main.rb
@@ -0,0 +1,106 @@
+require_relative 'planet'
+require_relative 'solar_system'
+
+puts "Welcome to the Solar System Encyclopedia!"
+
+def main
+  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')
+  menu_selection = [1..9]
+  all_planets = [earth, pluto, mercury, venus, mars, jupiter, saturn, uranus, neptune]
+  solar_system = SolarSystem.new('Sol')
+  solar_system.add_multiple_planets(all_planets)
+  puts "-*-*- Main Menu -*-*-"
+  puts "Please select what you would like to do:"
+  puts "1. list planets"
+  puts "2. planet details"
+  puts "3. add planet"
+  puts "4. calculate distance between two planets"
+  puts "5. exit"
+  puts "-*-*-*-*-*-*-*-*-*-*-"
+
+  selection = gets.chomp.to_s.downcase
+  options = ["list planets", "1", "planet details", "2", "add planet", "3", "calculate distance between two planets", "4", "exit", "5"]
+
+  until options.include?(selection)
+    puts "Please select what you would like to do:"
+    puts "1. list planets"
+    puts "2. planet details"
+    puts "3. add planet"
+    puts "4. calculate distance between two planets"
+    puts "5. exit"
+    selection = gets.chomp.to_s.downcase
+  end
+
+  if selection == "exit" || selection == "5"
+    puts "Thank you for visiting the Solar System Encyclopedia!"
+    exit
+  elsif selection == "list planets" || selection == "1"
+    puts solar_system.list_planets
+    main
+  elsif selection == "add planet" || selection == "3"
+    add_planet(solar_system)
+  elsif selection == "calculate distance between two planets" || selection == "4"
+    distance_between(solar_system)
+  else
+    planet_details(solar_system)
+  end
+end
+
+def planet_details(solar_system)
+  puts "Which planet would you like to learn about? You can choose any planet orbiting our Solar System 'Sol'"
+  puts solar_system.list_planets
+  planet_selection = gets.chomp.to_s
+  until solar_system.include?(planet_selection)
+    puts "Which planet would you like to learn about? You can choose any planet orbiting our Solar System 'Sol'"
+    puts solar_system.list_planets
+    planet_selection = gets.chomp
+  end
+  chosen_planet = solar_system.find_planet_by_name(planet_selection)
+  puts chosen_planet.summary
+  main
+end
+
+def add_planet(solar_system)
+  puts "Please enter the name of the planet:"
+  name = gets.chomp
+  puts "Please enter the color of the planet:"
+  color = gets.chomp
+  puts "Please enter the mass of the planet in kg:"
+  mass = gets.chomp.to_i
+    until mass > 0
+      puts "That is not a valid mass. Please enter the mass for the planet in kg."
+      detail = gets.chomp.to_i
+    end
+  puts "Please enter the distance of the planet from the sun in km:"
+  distance = gets.chomp.to_i
+    until detail > 0
+      puts "That is not a valid distance. Please enter the distance of the planet from the sun in km."
+      detail = gets.chomp.to_i
+    end
+  puts "Please enter a fact about the planet:"
+  fact = gets.chomp
+  solar_system.add_planet(Planet.new(name, color, mass, distance, fact))
+  main
+end
+
+def distance_between(solar_system)
+  puts "Please name the first planet:"
+  planet_one = gets.chomp
+  puts "Please name the second planet"
+  planet_two = gets.chomp
+
+  # until all_planets.include?()
+
+  puts "The distance between #{planet_one} and #{planet_two} is: #{solar_system.distance_between(planet_one, planet_two)}km"
+  main
+end
+
+main
diff --git a/planet.rb b/planet.rb
new file mode 100644
index 00000000..c94ea6da
--- /dev/null
+++ b/planet.rb
@@ -0,0 +1,36 @@
+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.to_s.capitalize} is a #{@color} planet that weighs #{@mass_kg}kg. 
+It is approximately #{@distance_from_sun_km}km away from the sun, and a fact about is: #{@fun_fact}"
+  end
+end
+
+# 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')
+# menu_selection = [1..9]
+# all_planets = [earth, pluto, mercury, venus, mars, jupiter, saturn, uranus, neptune]
+# solar_system = SolarSystem.new('Sol')
+# solar_system.add_multiple_planets(all_planets)
\ No newline at end of file
diff --git a/solar_system.rb b/solar_system.rb
new file mode 100644
index 00000000..6c1c900a
--- /dev/null
+++ b/solar_system.rb
@@ -0,0 +1,56 @@
+class SolarSystem
+  attr_reader :star_name, :planets
+  def initialize (star_name)
+    @star_name = star_name
+    @planets = []
+  end
+
+  def add_planet(planet)
+    @planets << planet
+    @planets.sort_by! { |planet| planet.distance_from_sun_km}
+  end
+  
+  def add_multiple_planets(planets)
+    planets.each do |planet|
+      @planets << planet
+    end
+    @planets.sort_by! { |planet| planet.distance_from_sun_km}
+  end
+
+  def list_planets
+    list = "Planets orbiting #{@star_name}:\n"
+    @planets.each_with_index do |planet, index|
+      list += "#{index + 1}. #{planet.name.to_s.capitalize}\n"
+    end
+    return list
+  end
+
+  def find_planet_by_name(planet_name)
+    planet_name = planet_name.capitalize
+    planets.each do |item|
+      if item.name == planet_name
+        return item
+      end
+    end
+  end
+
+  def include?(planet)
+    planet_strings = @planets.map {|index| index.name}
+    if planet_strings.include?(planet.capitalize)
+      return true
+    else
+      return false
+    end
+  end
+
+  def distance_between(selection_one, selection_two)
+    planet_one = self.find_planet_by_name(selection_one)
+    planet_two = self.find_planet_by_name(selection_two)
+    if planet_one.distance_from_sun_km > planet_two.distance_from_sun_km
+      distance_between = planet_one.distance_from_sun_km - planet_two.distance_from_sun_km
+    else
+      distance_between = planet_two.distance_from_sun_km - planet_one.distance_from_sun_km
+    end
+    return distance_between
+  end
+end
\ No newline at end of file