diff --git a/main/cutter.cpp b/main/cutter.cpp
index 9109d8e..a16039a 100644
--- a/main/cutter.cpp
+++ b/main/cutter.cpp
@@ -19,6 +19,8 @@ cutter_state_t cutter_state = cutter_state_t::IDLE;
 uint32_t timestamp_turnedOn;
 uint32_t msTimeout = 3000;
 static const char *TAG = "cutter"; //tag for logging
+gpio_evaluatedSwitch POSITION_SW(GPIO_CUTTER_POS_SW, true, false); //pullup true, not inverted (switch to GND, internal pullup used)
+
 
 
 
@@ -37,7 +39,9 @@ void cutter_start(){
 //========= stop =========
 //========================
 void cutter_stop(){
-    setState(cutter_state_t::CANCELED);
+    if(cutter_state =! cutter_state_t::IDLE){
+        setState(cutter_state_t::CANCELED);
+    }
     //starts motor on state change
 }
 
@@ -110,6 +114,12 @@ bool checkTimeout(){
 //========================
 //function that handles the cutter logic -> has to be run repeatedly
 void cutter_handle(){
+    //handle evaluated switch (position switch)
+    POSITION_SW.handle();
+    //TODO add custom thresholds once at initialization?
+    //POSITION_SW.minOnMs = 10;
+    //POSITION_SW.minOffMs = 10;
+
 
     switch(cutter_state){
         case cutter_state_t::IDLE:
@@ -120,8 +130,8 @@ void cutter_handle(){
 
         case cutter_state_t::START:
             //--- moved away from idle position ---
-            if (gpio_get_level(GPIO_CUTTER_POS_SW) == 0){ //switch closed
-                                                          //FIXME: initialize gpio as input with PULLUP somewhere
+            //if (gpio_get_level(GPIO_CUTTER_POS_SW) == 0){ //contact closed
+            if (POSITION_SW.state == true) { //contact closed -> not at idle pos
                 setState(cutter_state_t::CUTTING);
             }
             //--- timeout ---
@@ -133,7 +143,9 @@ void cutter_handle(){
 
         case cutter_state_t::CUTTING:
             //--- idle position reached ---
-            if (gpio_get_level(GPIO_CUTTER_POS_SW) == 1){ //switch not closed
+            //if (gpio_get_level(GPIO_CUTTER_POS_SW) == 1){ //contact not closed
+            //TODO: add min on duration
+            if (POSITION_SW.state == false) { //contact open -> at idle pos
                 setState(cutter_state_t::IDLE);
             }
             //--- timeout ---
diff --git a/main/cutter.hpp b/main/cutter.hpp
index ec16b0b..d45920a 100644
--- a/main/cutter.hpp
+++ b/main/cutter.hpp
@@ -6,6 +6,7 @@ extern "C"
 
 #include "buzzer.hpp"
 #include "display.hpp"
+#include "gpio_evaluateSwitch.hpp"
 
 
 //--- variables ---
diff --git a/main/main.cpp b/main/main.cpp
index 5a204b6..126025b 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -44,11 +44,11 @@ void init_gpios(){
     //initialize and configure ADC
     adc1_config_width(ADC_WIDTH_BIT_12); //=> max resolution 4096
     adc1_config_channel_atten(ADC_CHANNEL_POTI, ADC_ATTEN_DB_11); //max voltage
-    //initialize input for cutter position switch with pullup
-    gpio_pad_select_gpio(GPIO_CUTTER_POS_SW);
-    gpio_set_direction(GPIO_CUTTER_POS_SW, GPIO_MODE_INPUT);
-    gpio_pad_select_gpio(GPIO_CUTTER_POS_SW);
-    gpio_set_pull_mode(GPIO_CUTTER_POS_SW, GPIO_PULLUP_ONLY);
+    ////initialize input for cutter position switch with pullup (now done via evaluatedSwitch construcor)
+    //gpio_pad_select_gpio(GPIO_CUTTER_POS_SW);
+    //gpio_set_direction(GPIO_CUTTER_POS_SW, GPIO_MODE_INPUT);
+    //gpio_pad_select_gpio(GPIO_CUTTER_POS_SW);
+    //gpio_set_pull_mode(GPIO_CUTTER_POS_SW, GPIO_PULLUP_ONLY);
 
 }