diff --git a/.gitignore b/.gitignore
index b49a22a..57a4122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/cache
\ No newline at end of file
+/cache
+/__pycache__
diff --git a/ephemeris.py b/ephemeris.py
index b80c581..3177509 100644
--- a/ephemeris.py
+++ b/ephemeris.py
@@ -1,20 +1,24 @@
+from multiprocessing import Pool as ThreadPool
 from skyfield.api import Loader, Topos
 from skyfield import almanac
 
 
 class Ephemeris:
+    MONTH = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
+    PLANETS = ['MERCURY', 'VENUS', 'MARS', 'JUPITER BARYCENTER', 'SATURN BARYCENTER', 'URANUS BARYCENTER',
+               'NEPTUNE BARYCENTER', 'PLUTO BARYCENTER']
     position = None
+    latitude = None
+    longitude = None
     timescale = None
     planets = None
 
     def __init__(self, position):
-        self.MONTH = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-        self.PLANETS = ['mercury', 'venus', 'mars', 'jupiter', 'saturn', 'uranus', 'neptune', 'pluto']
-
         load = Loader('./cache')
         self.timescale = load.timescale()
         self.planets = load('de421.bsp')
-
+        self.latitude = position['lat']
+        self.longitude = position['lon']
         self.position = Topos(latitude_degrees=position['lat'], longitude_degrees=position['lon'])
 
     def compute_ephemeris_for_day(self, year: int, month: int, day: int) -> dict:
@@ -25,6 +29,7 @@ class Ephemeris:
         # Compute sunrise and sunset
         ephemeris['sun'] = self.get_sun(time1, time2)
         ephemeris['moon'] = self.get_moon(year, month, day)
+        ephemeris['planets'] = self.get_planets(year, month, day)
 
         return ephemeris
 
@@ -44,6 +49,109 @@ class Ephemeris:
 
         return {'phase': y[-1]}
 
+    def get_planets(self, year: int, month: int, day: int) -> dict:
+        args = []
+
+        for planet_name in self.PLANETS:
+            args.append({'planet': planet_name,
+                         'observer': {'latitude': self.latitude, 'longitude': self.longitude},
+                         'year': year, 'month': month, 'day': day})
+
+        with ThreadPool(4) as pool:
+            planets = pool.map(Ephemeris.get_planet, args)
+
+        obj = {}
+
+        for planet in planets:
+            obj[planet['name'].split(' ')[0]] = {'rise': planet['rise'], 'maximum': planet['maximum'],
+                                                 'set': planet['set']}
+
+        return obj
+
+    @staticmethod
+    def get_planet(o) -> dict:
+        load = Loader('./cache')
+        planets = load('de421.bsp')
+        timescale = load.timescale()
+        position = Topos(latitude_degrees=o['observer']['latitude'], longitude_degrees=o['observer']['longitude'])
+        observer = planets['earth'] + position
+        planet = planets[o['planet']]
+        rise_time = maximum_time = set_time = None
+        max_elevation = None
+        is_risen = None
+        is_elevating = None
+        last_is_elevating = None
+        last_position = None
+
+        for hours in range(0, 24):
+            time = timescale.utc(o['year'], o['month'], o['day'], hours)
+            position = observer.at(time).observe(planet).apparent().altaz()[0].degrees
+
+            if is_risen is None:
+                is_risen = position > 0
+            if last_position is not None:
+                is_elevating = last_position < position
+
+            if rise_time is None and not is_risen and is_elevating and position > 0:
+                # Planet has risen in the last hour, let's look for a more precise time!
+                for minutes in range(0, 60):
+                    time = timescale.utc(o['year'], o['month'], o['day'], hours - 1, minutes)
+                    position = observer.at(time).observe(planet).apparent().altaz()[0].degrees
+
+                    if position > 0:
+                        # Planet has just risen!
+                        rise_time = time
+                        is_risen = True
+                        break
+
+            if set_time is None and is_risen and not is_elevating and position < 0:
+                # Planet has set in the last hour, let's look for a more precise time!
+                for minutes in range(0, 60):
+                    time = timescale.utc(o['year'], o['month'], o['day'], hours - 1, minutes)
+                    position = observer.at(time).observe(planet).apparent().altaz()[0].degrees
+
+                    if position < 0:
+                        # Planet has just set!
+                        set_time = time
+                        is_risen = False
+                        break
+
+            print(is_elevating, last_is_elevating, max_elevation, last_position, position)
+
+            if not is_elevating and last_is_elevating:
+                # Planet has reached its azimuth in the last hour, let's look for a more precise time!
+                for minutes in range(0, 60):
+                    time = timescale.utc(o['year'], o['month'], o['day'], hours - 1, minutes)
+                    position = observer.at(time).observe(planet).apparent().altaz()[0].degrees
+
+                    max_elevation = position
+                    maximum_time = time
+
+                    if last_position > position:
+                        # Planet has reached its azimuth!
+                        is_elevating = False
+                        break
+
+                    last_position = position
+
+            last_position = position
+            last_is_elevating = is_elevating
+
+            if rise_time is not None and set_time is not None and maximum_time is not None:
+                return {
+                    'name': o['planet'],
+                    'rise': rise_time.utc_iso(),
+                    'maximum': maximum_time.utc_iso(),
+                    'set': set_time.utc_iso()
+                }
+
+        return {
+            'name': o['planet'],
+            'rise': rise_time.utc_iso() if rise_time is not None else None,
+            'maximum': maximum_time.utc_iso() if maximum_time is not None else None,
+            'set': set_time.utc_iso() if set_time is not None else None
+        }
+
     def compute_ephemeris_for_month(self, year: int, month: int) -> list:
         if month == 2:
             is_leap_year = (year % 4 == 0 and year % 100 > 0) or (year % 400 == 0)
diff --git a/main.py b/main.py
index 22d04f6..a0357ba 100644
--- a/main.py
+++ b/main.py
@@ -18,7 +18,7 @@ def main():
     year = args.year
     month = args.month
     day = args.date
-    position = {'lat': args.latitude, 'lon': args.longitude, 'altitude': args.altitude}
+    position = {'lat': args.latitude, 'lon': args.longitude, 'alt': args.altitude}
 
     if day is not None and month is None:
         month = date.today().month