Index: firmware/source/sys_main.c
===================================================================
diff -u -rcb9bcb7376f09096f833ce59cfb9a71f43263315 -ra35d5e68aad457339f625848809207a9650ad019
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision cb9bcb7376f09096f833ce59cfb9a71f43263315)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision a35d5e68aad457339f625848809207a9650ad019)
@@ -63,6 +63,7 @@
 
 #include "HDCommon.h"
 #include "Accel.h"
+#include "AirTrap.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
@@ -163,28 +164,37 @@
  *************************************************************************/
 static void initSoftware( void )
 {
-    initAlarmMgmt();
+    // initialize ms timer counter
     initTimers();
+    // initialize alarm manager
+    initAlarmMgmt();
+    // initialize drivers
     initCPLD();
     initSafetyShutdown();
-    initWatchdogMgmt();
-    initInterrupts();
-    initFPGA();
-    initAlarmLamp();
-    initButtons();
     initInternalADC();
+    initRTC();
+    // initialize services
     initCommBuffers();
+    initFPGA();
     initMsgQueues();
+    initNVDataMgmt();
     initSystemComm();
+    initWatchdogMgmt();
+    // initialize monitors
+    initAccel();
+    initButtons();
     initPresOccl();
+    // initialize controllers
+    initAirTrap();
+    initAlarmLamp();
     initBloodFlow();
     initDialInFlow();
     initDialOutFlow();
-    initAccel();
-    initOperationModes();
-    initRTC();
-    initNVDataMgmt();
     initValves();
+    // initialize modes
+    initOperationModes();
+    // initialize async interrupt handlers
+    initInterrupts();
 }
 
 /*************************************************************************