Index: firmware/source/sys_main.c
===================================================================
diff -u -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -61,13 +61,16 @@
 #include "rti.h"
 
 #include "DGCommon.h"
+#include "Accel.h"
 #include "AlarmMgmt.h"
 #include "CommBuffers.h"
+#include "ConductivitySensors.h"
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "InternalADC.h"
+#include "Interrupts.h"
 #include "LoadCell.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
@@ -164,15 +167,18 @@
     initCPLD();
     initAlarmMgmt();
     initWatchdogMgmt();
+    initInterrupts();
     initFPGA();
     initInternalADC();
     initPressures();
     initLoadCell();
     initValves();
     initHeaters();
     initTemperatureSensors();
+    initConductivitySensors();
     initROPump();
     initDrainPump();
+    initAccel();
     initRTC();
     initCommBuffers();
     initMsgQueues();
@@ -207,7 +213,7 @@
     rtiInit();
     rtiEnableNotification( rtiNOTIFICATION_COMPARE0 | rtiNOTIFICATION_COMPARE1 | rtiNOTIFICATION_COMPARE3 );
     rtiStartCounter( rtiCOUNTER_BLOCK0 );
-    // the timer task (and other comm related interrupts) require FIQ enabled
+    // the timer task requires FIQ enabled
     _enable_FIQ();
     // the general and priority tasks require IRQ enabled
     _enable_IRQ();