diff --git a/src/Controller/AnalyticsController.php b/src/Controller/AnalyticsController.php
index 4d589899..45effd17 100644
--- a/src/Controller/AnalyticsController.php
+++ b/src/Controller/AnalyticsController.php
@@ -22,6 +22,8 @@ use DateInterval;
 use App\Entity\JobOrder;
 use App\Entity\Hub;
 
+use App\Ramcar\ShiftSchedule;
+
 class AnalyticsController extends Controller
 {
     protected $weekdays = [
@@ -94,6 +96,7 @@ class AnalyticsController extends Controller
         $params = [
             'hub_list' => $hub_list,
             'default_hubs' => $hub_ids,
+            'shift_schedules' => ShiftSchedule::getCollection(),
         ];
 
         return $this->render('analytics/forecast_form.html.twig', $params);
@@ -117,6 +120,11 @@ class AnalyticsController extends Controller
         $date_from = DateTime::createFromFormat('d M Y', $req->request->get('date_from'));
         $date_to = DateTime::createFromFormat('d M Y', $req->request->get('date_to'));
 
+        $shift = $req->request->get('shift_schedule');
+
+        // TODO: populate the hour_shift array, depending on the shift selected
+        $hour_shift = $this->populateHourShift($shift);
+
         // error_log(print_r($hub_list, true));
 
         // $hub_list = [ 6, 4, 36, 7, 8, 126, 127, 18, 12, 9, 60, 10, 21, 135 ];
@@ -661,4 +669,8 @@ class AnalyticsController extends Controller
     protected function solveRiderSchedule()
     {
     }
+
+    protected function populateHourShift($shift)
+    {
+    }
 } 
diff --git a/src/Ramcar/ShiftSchedule.php b/src/Ramcar/ShiftSchedule.php
new file mode 100644
index 00000000..85e733b4
--- /dev/null
+++ b/src/Ramcar/ShiftSchedule.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Ramcar;
+
+class ShiftSchedule extends NameValue
+{
+    const SCHED_24_7 = '24_7';
+    const SCHED_8_5  = '8_5';
+
+    const COLLECTION = [
+        '24_7' => '24/7 Schedule',
+        '8_5' => '8-5 Schedule',
+    ];
+}
diff --git a/templates/analytics/forecast_form.html.twig b/templates/analytics/forecast_form.html.twig
index d2c6108a..b43d6d6f 100644
--- a/templates/analytics/forecast_form.html.twig
+++ b/templates/analytics/forecast_form.html.twig
@@ -30,6 +30,17 @@
                 <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ url('analytics_forecast_submit') }}">
 
                     <div class="m-portlet__body">
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label data-field="shift_schedule">Shift Schedule</label>
+                                <select id="shift_schedule" class="form-control m-input" name="shift_schedule">
+                                    {% for key, schedule in shift_schedules %}
+                                        <option value="{{ key }}">{{ schedule }}</option>
+                                    {% endfor %}
+                                </select>
+                                <div class="form-control-feedback hide" data-field="shift_schedule"></div>
+                            </div>
+                        </div>
                         <div class="form-group m-form__group row no-border">
                            <div class="col-lg-6">
                                <label data-field="time_from">Restrict Time From</label>