diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
index 4f2738e..344a87e 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
@@ -62,6 +62,9 @@
     boolean customLocationFound;
     Location customLocation;
 
+    private final static int DAILY_FORECAST_MAX = 16; //http://openweathermap.org/api
+    private final static int HOUR_FORECAST_MAX = 5; //http://openweathermap.org/api
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -172,12 +175,12 @@
                 Log.d(MainActivity.TAG, "currentSelected: " + currentSelected);
                 Log.d(MainActivity.TAG, "nrOfForecastDays: " + nrOfForecastDays);
 
-                if(currentSelected.equals(getString(R.string.download_forecast_key))) {
+                if(currentSelected.equals(getString(R.string.download_forecast_daily_key))) {
                     weatherHandler.getForecast(l, nrOfForecastDays, DownloadActivity.this);
+                } else if(currentSelected.equals(getString(R.string.download_forecast_hour_key))) {
+                    weatherHandler.getForecastHour(l, nrOfForecastDays, DownloadActivity.this);
                 } else if(currentSelected.equals(getString(R.string.download_current_key))) {
                     weatherHandler.getCurrentWeather(l, DownloadActivity.this);
-                } else if(currentSelected.equals(getString(R.string.download_day_key))) {
-                    //TODO CORE?
                 }
             }
         });
@@ -191,8 +194,14 @@
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 String key = currentSelected = getResources().getStringArray(R.array.download_categories_keys)[position];
-                if(key.equals(getString(R.string.download_forecast_key))) {
+                if(key.equals(getString(R.string.download_forecast_daily_key))) {
                     dayLayout.setVisibility(View.VISIBLE);
+                    dayPicker.setMax(DAILY_FORECAST_MAX - 1);
+                    if(dayPicker.getProgress() > DAILY_FORECAST_MAX - 1) dayPicker.setProgress(DAILY_FORECAST_MAX - 1);
+                } else if(key.equals(getString(R.string.download_forecast_hour_key))) {
+                    dayLayout.setVisibility(View.VISIBLE);
+                    dayPicker.setMax(HOUR_FORECAST_MAX - 1);
+                    if(dayPicker.getProgress() > HOUR_FORECAST_MAX - 1) dayPicker.setProgress(HOUR_FORECAST_MAX - 1);
                 } else {
                     dayLayout.setVisibility(View.INVISIBLE);
                 }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
index 3b9cac4..1b75c9e 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
@@ -27,6 +27,7 @@
 
 import com.survivingwithandroid.weather.lib.WeatherCode;
 import com.survivingwithandroid.weather.lib.model.DayForecast;
+import com.survivingwithandroid.weather.lib.model.HourForecast;
 import com.survivingwithandroid.weather.lib.model.Weather;
 
 import java.util.Arrays;
@@ -85,6 +86,10 @@
 
     public MyWeather() {}
 
+    public MyWeather(HourForecast hourForecast) {
+        this(hourForecast.weather, hourForecast.timestamp);
+    }
+
     public MyWeather(DayForecast dayForecast) {
         this(dayForecast.weather, dayForecast.timestamp);
     }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
index d549f21..b547d35 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
@@ -37,8 +37,10 @@
 import com.survivingwithandroid.weather.lib.model.DayForecast;
 import com.survivingwithandroid.weather.lib.model.HistoricalHourWeather;
 import com.survivingwithandroid.weather.lib.model.HistoricalWeather;
+import com.survivingwithandroid.weather.lib.model.HourForecast;
 import com.survivingwithandroid.weather.lib.model.Weather;
 import com.survivingwithandroid.weather.lib.model.WeatherForecast;
+import com.survivingwithandroid.weather.lib.model.WeatherHourForecast;
 import com.survivingwithandroid.weather.lib.provider.openweathermap.OpenweathermapProviderType;
 import com.survivingwithandroid.weather.lib.request.WeatherRequest;
 
@@ -65,6 +67,7 @@
     private WeatherConfig weatherConfig;
     private HistoricalWeather histWeather;
     private DayForecast[] forecasts;
+    private HourForecast[] hourForecasts;
     private Weather[] weathers;
     public final static int MIN_HOT_TEMP_DEFAULT = 30;
     public final static int MAX_COLD_TEMP_DEFAULT = 10;
@@ -155,6 +158,95 @@
         getFromDatabase(lat, lon, offset, callback);
     }
 
+    public void getForecastHour(int days, OnWeatherRetrieved callback) {
+        getForecastHour(MainActivity.getLocation(), days, callback);
+    }
+
+    public void getForecastHour(Location l, OnWeatherRetrieved callback) {
+        if(l == null) return;
+        getForecastHour(l.getLatitude(), l.getLongitude(), callback);
+    }
+
+    public void getForecastHour(Location l, int days, OnWeatherRetrieved callback) {
+        if(l == null) return;
+        getForecastHour(l.getLatitude(), l.getLongitude(), days, callback);
+    }
+
+    public void getForecastHour(double lat, double lon, OnWeatherRetrieved callback) {
+        getForecastHour(lat, lon, MAX_DAYS_FORECAST, callback);
+    }
+
+    public void getForecastHour(double lat, double lon, int days, OnWeatherRetrieved callback) {
+        if(MainActivity.hasInternet()) getForecastOnlineHour(lat, lon, days, callback);
+        else getForecastCachedHour(lat, lon, days, 0, callback);
+    }
+
+    public void getForecastOnlineHour(double lat, double lon, final int days, final OnWeatherRetrieved callback) {
+        weatherConfig.numDays = days;
+        weatherClient.updateWeatherConfig(weatherConfig);
+        weatherClient.getHourForecastWeather(new WeatherRequest(lon, lat), new WeatherClient.HourForecastWeatherEventListener() {
+            @Override
+            public void onWeatherRetrieved(WeatherHourForecast forecast) {
+                List<MyWeather> weatherList = new ArrayList<>();
+                List<HourForecast> foundForecasts = forecast.getHourForecast();
+                int dayCount = Math.min(foundForecasts.size(), days);
+                if(dayCount == 0) return;
+                hourForecasts = new HourForecast[dayCount];
+                weathers = new Weather[dayCount];
+                for(int i=0; i<dayCount; i++) {
+                    HourForecast curr = foundForecasts.get(i);
+                    hourForecasts[i] = curr;
+                    weathers[i] = curr.weather;
+                    MyWeather newWeather = new MyWeather(curr);
+                    insertIntoDatabase(newWeather);
+                    weatherList.add(newWeather);
+                }
+                Log.d(MainActivity.TAG, "City [" + weathers[0].location.getCity() + "] Current temp: " + weathers[0].temperature.getTemp());
+
+                String title = String.format("Weather for %s in %s", weathers[0].location.getCity(), weathers[0].location.getCountry());
+                String msg = String.format("%1$.1f%2$s (%3$.1f%4$s/%5$.1f%6$s)\nSunrise: %7$s\nSunset: %8$s\nWeatherCode: %9$d\nWeatherId: %10$d",
+                        forecasts[0].forecastTemp.day,
+                        forecast.getUnit().tempUnit,
+                        forecasts[0].forecastTemp.min,
+                        forecast.getUnit().tempUnit,
+                        forecasts[0].forecastTemp.max,
+                        forecast.getUnit().tempUnit,
+                        MainActivity.df_hm.format(new Date(weathers[0].location.getSunrise() * 1000)),
+                        MainActivity.df_hm.format(new Date(weathers[0].location.getSunset() * 1000)),
+                        weathers[0].currentCondition.getWeatherCode().getCode(),
+                        weathers[0].currentCondition.getWeatherId());
+                Log.d(MainActivity.TAG, title + ": " + msg);
+                callback.postRetrieve(weatherList);
+                //displayHints(weatherList.get(0));
+                //displaySevereWeather(weatherList.get(0));
+            }
+
+            @Override
+            public void onWeatherError(WeatherLibException wle) {
+                Log.e(MainActivity.TAG, "Weather error - parsing data");
+                wle.printStackTrace();
+            }
+
+            @Override
+            public void onConnectionError(Throwable t) {
+                Log.e(MainActivity.TAG, "Connection Error");
+                t.printStackTrace();
+            }
+        });
+    }
+
+    //TODO CORE get hour forecast from cache
+    public void getForecastCachedHour(double lat, double lon, int days, int offset, OnWeatherRetrieved callback) {
+        long timestamp = System.currentTimeMillis();
+        List<MyWeather> weathers = new ArrayList<>();
+        for(int i=0; i<days; i++) {
+            weathers.add(weatherDb.getWeather(lat, lon, timestamp, offset));
+            timestamp += DAY_IN_MS;
+        }
+        callback.postRetrieve(weathers);
+        return;
+    }
+
     public void getForecast(int days, OnWeatherRetrieved callback) {
         getForecast(MainActivity.getLocation(), days, callback);
     }
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ff2282b..d32938a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -159,9 +159,9 @@
         <item>überdacht</item>
     </string-array>
     <string-array name="download_categories">
-        <item>Vorhersage</item>
+        <item>Vorhersage (täglich)</item>
+        <item>Vorhersage (3 Stunden)</item>
         <item>Aktuell</item>
-        <item>Heute</item>
     </string-array>
     <plurals name="number_of_days_plurals">
         <item quantity="one">%1$s Tag</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad03071..09390b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,9 +126,9 @@
     <string name="settings_weather_days_forecast_key" translatable="false">daysOfForecast</string>
     <string name="settings_osm_user_key" translatable="false">username</string>
     <string name="settings_osm_password_key" translatable="false">password</string>
-    <string name="download_forecast_key" translatable="false">forecast</string>
+    <string name="download_forecast_daily_key" translatable="false">forecastDaily</string>
+    <string name="download_forecast_hour_key" translatable="false">forecastHour</string>
     <string name="download_current_key" translatable="false">current</string>
-    <string name="download_day_key" translatable="false">day</string>
 
     <string name="preferences_maximal_cold_temp_min" translatable="false">5</string>
     <string name="preferences_minimal_hot_temp_min" translatable="false">20</string>
@@ -196,14 +196,14 @@
         <item>Roofed</item>
     </string-array>
     <string-array name="download_categories">
-        <item>Forecast</item>
+        <item>Forecast (daily)</item>
+        <item>Forecast (3 hour)</item>
         <item>Current</item>
-        <item>Today</item>
     </string-array>
     <string-array name="download_categories_keys" translatable="false">
-        <item>@string/download_forecast_key</item>
+        <item>@string/download_forecast_daily_key</item>
+        <item>@string/download_forecast_hour_key</item>
         <item>@string/download_current_key</item>
-        <item>@string/download_day_key</item>
     </string-array>
     <plurals name="number_of_days_plurals">
         <item quantity="one">%1$s day</item>