diff --git a/app/client/settings.html b/app/client/settings.html
index 0bb57c1..c8bea6e 100644
--- a/app/client/settings.html
+++ b/app/client/settings.html
@@ -91,6 +91,14 @@
               <label for="day_7">Nedjelja</label>
             </div>
           </div>
+          <div class="form-group">
+            <div>
+              <input type="checkbox" value="true" id="manual_inflow" name="manual_inflow" class="manual_inflow_checkbox form_control" checked="{{ manualInflowChecked }}" /> Ručna kontrola pumpe
+            </div>
+            <div class="bg-danger">
+              PAŽNJA! Ako pumpa predugo bude radila - rezervoar se može prepuniti.
+            </div>
+          </div>
         </div>
 
         <div class="modal-footer">
diff --git a/app/client/settings.js b/app/client/settings.js
index a20a04a..6d7bb6b 100644
--- a/app/client/settings.js
+++ b/app/client/settings.js
@@ -25,6 +25,11 @@ Template.settings.helpers({
     return days.includes(day)
   },
 
+  manualInflowChecked: function(day) {
+    var config = controller_state().config;
+    return config.manualInflow;
+  }
+
 
 });
 
@@ -38,8 +43,10 @@ Template.settings.events({
         selectedDays.push(instance.$(this).val());
       }
     });
+    var manualInflow = instance.$('#manual_inflow').is(':checked');
+    console.log("MI ", manualInflow);
     var controller_id = Session.get('controller_id');
-    Meteor.call('saveControllerConfig', controller_id, selectedTime, selectedDays);
+    Meteor.call('saveControllerConfig', controller_id, selectedTime, selectedDays, manualInflow);
   }
 });
 
diff --git a/app/client/state.html b/app/client/state.html
index 80c7664..edd31d8 100644
--- a/app/client/state.html
+++ b/app/client/state.html
@@ -14,6 +14,8 @@
     <div>
       <button id="water_now" class="{{ water_now_button_class }}">Zalij sada</button>
       <button id="stop_water_now" class="{{ stop_button_class }}">Prekini zalijevanje</button>
+        <button id="start_inflow_now" class="{{ start_inflow_button_class }}">Počni punjenje</button>
+        <button id="stop_inflow_now" class="{{ stop_inflow_button_class }}">Prekini punjenje</button>
     </div>
   </div>
 </template>
diff --git a/app/client/state.js b/app/client/state.js
index eb05d26..dceeee7 100644
--- a/app/client/state.js
+++ b/app/client/state.js
@@ -90,6 +90,25 @@ Template.state.helpers({
     }
   },
 
+  start_inflow_button_class: function() {
+    var stateObject = controller_state();
+    if(stateObject.config && stateObject.config.manualInflow && stateObject.state.out_valve === 'closed' && ( stateObject.state.in_valve === 'closed' ||  stateObject.state.in_valve === 'closing')) {
+      return 'btn btn-danger'
+    } else {
+      return 'hidden btn btn-danger'
+    }
+  },
+
+  stop_inflow_button_class: function() {
+    var stateObject = controller_state();
+    if(stateObject.config && stateObject.config.manualInflow && stateObject.state.out_valve === 'closed' && ( stateObject.state.in_valve === 'open' ||  stateObject.state.in_valve === 'opening')) {
+      return 'btn btn-danger'
+    } else {
+      return 'hidden btn btn-danger'
+    }
+  },
+
+
   pretty_days: function(daysInNumbers) {
     var days = ["Nedjelja", "Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota"];
     if (!daysInNumbers || daysInNumbers.length == 0) {
@@ -125,6 +144,16 @@ Template.state.events({
     Meteor.call('closeOutValve', controller_id)
   },
 
+  'click #start_inflow_now': function() {
+    var controller_id = Session.get('controller_id');
+    Meteor.call('openInValve', controller_id)
+  },
+
+  'click #stop_inflow_now': function() {
+    var controller_id = Session.get('controller_id');
+    Meteor.call('closeInValve', controller_id)
+  },
+
   'click #run_settings': function() {
     Modal.show('settings');
   },
diff --git a/app/server/api.js b/app/server/api.js
index 7540ac8..7f654d9 100644
--- a/app/server/api.js
+++ b/app/server/api.js
@@ -30,10 +30,12 @@ Api.addRoute('sensorData', {
 });
 
 
-function reactToSensorData(nextSensorReading) {
+reactToSensorData = function(nextSensorReading) {
   console.log("reacting to sensor");
   var controllerId = nextSensorReading.controllerId;
-  var state = stateOrDefault(controllerId).state;
+  var stateObject = stateOrDefault(controllerId);
+  var state = stateObject.state;
+  var config = stateObject.config;
 
   var startPumpingLevelReached;
   if (nextSensorReading.startPumpingAt == 'TANKLEVEL0') startPumpingLevelReached = (parseInt(nextSensorReading.tankLevel0) === 0)
@@ -43,7 +45,15 @@ function reactToSensorData(nextSensorReading) {
   else if (nextSensorReading.startPumpingAt == 'TANKLEVEL4') startPumpingLevelReached = (parseInt(nextSensorReading.tankLevel4) === 0)
   else startPumpingLevelReached = true;
 
-  var shouldStartPumping = (!state.in_valve || state.in_valve === 'closed') && ((parseInt(nextSensorReading.tankFull) === 0) && startPumpingLevelReached && (state.out_valve === 'closed' || state.out_valve === 'closing'));
+  var shouldStartAutomaticPumping = (!state.in_valve || state.in_valve === 'closed') && ((parseInt(nextSensorReading.tankFull) === 0) && startPumpingLevelReached && (state.out_valve === 'closed' || state.out_valve === 'closing'));
+
+    console.log("State: ", state);
+
+  var shouldStartPumping = shouldStartAutomaticPumping && config && !config.manualInflow;
+
+    console.log("shouldStartAutomaticPumping: ", shouldStartAutomaticPumping);
+
+  console.log("shouldStartPumping: ", shouldStartPumping);
 
   if (shouldStartPumping) {
     ControllerState.update({
@@ -65,7 +75,12 @@ function reactToSensorData(nextSensorReading) {
   else if (nextSensorReading.stopPumpingAt == 'TANKLEVEL4') stopPumpingLevelReached = (parseInt(nextSensorReading.tankLevel4) === 1)
   else stopPumpingLevelReached = false;
 
-  var shouldStopPumping =  (state.in_valve === 'open' || state.in_valve === 'opening') && (parseInt(nextSensorReading.tankFull) === 1 || stopPumpingLevelReached || state.out_valve === 'open' || state.out_valve === 'opening');
+  var shouldStopAutomaticPumping =  (state.in_valve === 'open' || state.in_valve === 'opening') && (parseInt(nextSensorReading.tankFull) === 1 || stopPumpingLevelReached || state.out_valve === 'open' || state.out_valve === 'opening');
+
+    var shouldStopPumping = shouldStopAutomaticPumping && config && !config.manualInflow;
+
+ console.log("shouldStopPumping: ", shouldStopPumping);
+
 
   if (shouldStopPumping) {
     ControllerState.update({
@@ -117,7 +132,8 @@ function stateOrDefault(id) {
       time: new Date(),
       config: {
         draining_period_amount: 40,
-        draining_period_unit: 'minutes'
+        draining_period_unit: 'minutes',
+        manualInflow: true
       },
       set_by: 'server'
     });
diff --git a/app/server/methods.js b/app/server/methods.js
index 0790a21..16d71cb 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -22,7 +22,7 @@ function setOutValveTo(controller_id, nextState) {
     }
   });
 
-  if(nextState === "open") {
+  if (nextState === "open") {
     ControllerState.update(state._id, {
       '$set': {
         'significantEvents.lastOutValveOpen': new Date(),
@@ -32,8 +32,50 @@ function setOutValveTo(controller_id, nextState) {
 
 }
 
+function setInValveTo(controller_id, nextState) {
+  var state = controller_state(controller_id);
+  ControllerState.update(state._id, {
+    '$set': {
+      'state.in_valve': nextState,
+      'time': new Date(),
+      'set_by': 'server'
+    }
+  });
+
+  if (nextState === "open") {
+    ControllerState.update(state._id, {
+      '$set': {
+        'significantEvents.lastInValveOpen': new Date(),
+      }
+    });
+  }
+
+}
+
+function openInValve(controller_id) {
+  var state = controller_state(controller_id);
+  var config = state.config;
+  if (config.manualInflow) {
+    setInValveTo(controller_id, 'opening');
+  }
+  reactToSensorData(last_sensor_reading(controller_id));
+}
+
+function closeInValve(controller_id) {
+  var state = controller_state(controller_id);
+  var config = state.config;
+  if (config.manualInflow) {
+    setInValveTo(controller_id, 'closing');
+  }
+  reactToSensorData(last_sensor_reading(controller_id));
+
+}
+
+
+
 function openOutValve(controller_id) {
   setOutValveTo(controller_id, 'opening');
+  setInValveTo(controller_id, 'closing');
   var state = controller_state(controller_id);
   var config = state.config;
   var jobName = "Close out valve " + state.controller_id + " after draining";
@@ -51,7 +93,7 @@ function openOutValve(controller_id) {
   });
   console.log(Meteor.sharedFunctions);
 
-  Meteor.sharedFunctions.reactToSensorData(last_sensor_reading(controller_id));
+  reactToSensorData(last_sensor_reading(controller_id));
 }
 
 function closeOutValve(controller_id) {
@@ -65,7 +107,7 @@ function closeOutValve(controller_id) {
 
   console.log(Meteor.sharedFunctions);
 
-  Meteor.sharedFunctions.reactToSensorData(last_sensor_reading(controller_id));
+  reactToSensorData(last_sensor_reading(controller_id));
 }
 
 function clearLog() {
@@ -73,12 +115,13 @@ function clearLog() {
   SensorData.remove({});
 }
 
-function saveControllerConfig(controller_id, time, days) {
+function saveControllerConfig(controller_id, time, days, manualInflow) {
   var state = controller_state(controller_id);
   ControllerState.update(state._id, {
     '$set': {
       'config.automaticTimeOfDay': time,
-      'config.automaticDaysOfWeek': days
+      'config.automaticDaysOfWeek': days,
+      'config.manualInflow': manualInflow
     }
   });
   var jobName = "automatic_" + controller_id;
@@ -128,6 +171,8 @@ function last_sensor_reading(controller_id) {
 Meteor.methods({
   openOutValve: openOutValve,
   closeOutValve: closeOutValve,
+  openInValve: openInValve,
+  closeInValve: closeInValve,
   clearLog: clearLog,
   saveControllerConfig: saveControllerConfig
 });