diff --git a/globals.h b/globals.h
index 4af9ef7..5dc30c2 100644
--- a/globals.h
+++ b/globals.h
@@ -258,6 +258,9 @@ byte pinO2; //O2 Sensor pin
 byte pinBat; //O2 Sensor pin
 byte pinDisplayReset; // OLED reset pin
 byte pinTachOut; //Tacho output
+byte pinFuelPump; //Fuel pump on/off
+byte pinIdle1; //Single wire idle control
+byte pinIdle2; //2 wire idle control (Not currently used)
 byte pinSpareTemp1; // Future use only
 byte pinSpareTemp2; // Future use only
 byte pinSpareOut1; //Generic output
diff --git a/speeduino.ino b/speeduino.ino
index 94170cb..3384b4c 100644
--- a/speeduino.ino
+++ b/speeduino.ino
@@ -120,16 +120,6 @@ void setup()
   loadCalibration();
   //Set the pin mappings
   setPinMapping(configPage1.pinMapping);
-
-  pinMode(pinCoil1, OUTPUT);
-  pinMode(pinCoil2, OUTPUT);
-  pinMode(pinCoil3, OUTPUT);
-  pinMode(pinCoil4, OUTPUT);
-  pinMode(pinInjector1, OUTPUT);
-  pinMode(pinInjector2, OUTPUT);
-  pinMode(pinInjector3, OUTPUT);
-  pinMode(pinInjector4, OUTPUT);
-  pinMode(pinTachOut, OUTPUT);
   
   //Need to check early on whether the coil charging is inverted. If this is not set straight away it can cause an unwanted spark at bootup  
   if(configPage2.IgInv == 1) { coilHIGH = LOW, coilLOW = HIGH; }
@@ -211,17 +201,6 @@ void setup()
   mainLoopCount = 0;
   ignitionCount = 0;
   
-  //Setup other relevant pins
-  pinMode(pinMAP, INPUT);
-  pinMode(pinO2, INPUT);
-  pinMode(pinTPS, INPUT);
-  pinMode(pinIAT, INPUT);
-  pinMode(pinCLT, INPUT);
-  //Turn on pullups for above pins
-  digitalWrite(pinMAP, HIGH);
-  //digitalWrite(pinO2, LOW);
-  digitalWrite(pinTPS, LOW);
-  
   //Calculate the number of degrees between cylinders
   switch (configPage1.nCylinders) {
     case 1:
@@ -279,6 +258,7 @@ void loop()
       unsigned long revolutionTime = (toothOneTime - toothOneMinusOneTime); //The time in uS that one revolution would take at current speed (The time tooth 1 was last seen, minus the time it was seen prior to that)
       interrupts();
       currentStatus.RPM = ldiv(US_IN_MINUTE, revolutionTime).quot; //Calc RPM based on last full revolution time (uses ldiv rather than div as US_IN_MINUTE is a long)
+      if(digitalRead(pinFuelPump) == LOW) { digitalWrite(pinFuelPump, HIGH); } //Check if the fuel pump is on and turn it on if it isn't. 
     }
     else
     {
@@ -289,6 +269,7 @@ void loop()
       currentStatus.hasSync = false;
       currentStatus.runSecs = 0; //Reset the counter for number of seconds running.
       secCounter = 0; //Reset our seconds counter.
+      digitalWrite(pinFuelPump, LOW); //Turn off the fuel pump
     }
     
     //Uncomment the following for testing
diff --git a/utils.ino b/utils.ino
index ce6b72e..bad410d 100644
--- a/utils.ino
+++ b/utils.ino
@@ -71,6 +71,9 @@ void setPinMapping(byte boardID)
       pinBat = A4; //Battery reference voltage pin
       pinDisplayReset = 48; // OLED reset pin
       pinTachOut = 49; //Tacho output pin
+      pinIdle1 = 5; //Single wire idle control
+      pinFuelPump = 4; //Fuel pump output
+
       break;
 
     case 3:
@@ -171,6 +174,32 @@ void setPinMapping(byte boardID)
       pinDisplayReset = 48; // OLED reset pin
       break;
   }
+
+  //Finally, set the relevant pin modes for outputs
+  pinMode(pinCoil1, OUTPUT);
+  pinMode(pinCoil2, OUTPUT);
+  pinMode(pinCoil3, OUTPUT);
+  pinMode(pinCoil4, OUTPUT);
+  pinMode(pinInjector1, OUTPUT);
+  pinMode(pinInjector2, OUTPUT);
+  pinMode(pinInjector3, OUTPUT);
+  pinMode(pinInjector4, OUTPUT);
+  pinMode(pinTachOut, OUTPUT);
+  pinMode(pinIdle1, OUTPUT);
+  pinMode(pinIdle2, OUTPUT);
+  pinMode(pinFuelPump, OUTPUT);
+  
+  //And for inputs
+  pinMode(pinMAP, INPUT);
+  pinMode(pinO2, INPUT);
+  pinMode(pinTPS, INPUT);
+  pinMode(pinIAT, INPUT);
+  pinMode(pinCLT, INPUT);
+  
+  //
+  digitalWrite(pinMAP, HIGH);
+  //digitalWrite(pinO2, LOW);
+  digitalWrite(pinTPS, LOW);
 }
 
 /*