diff --git a/.github/linters/checkstyle.xml b/.github/linters/checkstyle.xml
index 6a10d42c..5212262a 100644
--- a/.github/linters/checkstyle.xml
+++ b/.github/linters/checkstyle.xml
@@ -197,6 +197,12 @@
       <property name="optional" value="true"/>
     </module>
 
+	<module name="SuppressionCommentFilter">
+		<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+		<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+		<property name="checkFormat" value="$1"/>
+	</module>
+
   </module>
 
 </module>
\ No newline at end of file
diff --git a/src/main/java/com/team766/hal/simulator/VrConnector.java b/src/main/java/com/team766/hal/simulator/VrConnector.java
index 335a79ca..286367da 100644
--- a/src/main/java/com/team766/hal/simulator/VrConnector.java
+++ b/src/main/java/com/team766/hal/simulator/VrConnector.java
@@ -58,22 +58,24 @@ private static class CANPortMapping {
 	);
 	private static final List<PortMapping> RELAY_CHANNELS = Arrays.asList();
 
-	private static final List<CANPortMapping> CAN_MOTOR_CHANNELS =
-		Arrays.asList(new CANPortMapping(6, 10, 10), // Left motor
-			new CANPortMapping(4, 11, 11), // Right motor
-			new CANPortMapping(10, 12, 13), // Intake
-			new CANPortMapping(12, 14, 0), // Aux/center motor
-			new CANPortMapping(14, 16, 0), // Aux2 motor
-
-			new CANPortMapping(84, 84, 84), // FLD motor
-			new CANPortMapping(85, 85, 85), // BLD motor
-			new CANPortMapping(86, 86, 86), // FRD motor
-			new CANPortMapping(87, 87, 87), // BRD motor
-			new CANPortMapping(88, 88, 88), // FLS motor
-			new CANPortMapping(89, 89, 89), // BLS motor
-			new CANPortMapping(90, 90, 90), // FRS motor
-			new CANPortMapping(91, 91, 91) // BRS motor
-		);
+	//CHECKSTYLE:OFF
+	private static final List<CANPortMapping> CAN_MOTOR_CHANNELS = Arrays.asList(
+		new CANPortMapping(6, 10, 10), // Left motor
+		new CANPortMapping(4, 11, 11), // Right motor
+		new CANPortMapping(10, 12, 13), // Intake
+		new CANPortMapping(12, 14, 0), // Aux/center motor
+		new CANPortMapping(14, 16, 0), // Aux2 motor
+
+		new CANPortMapping(84, 84, 84), // FLD motor
+		new CANPortMapping(85, 85, 85), // BLD motor
+		new CANPortMapping(86, 86, 86), // FRD motor
+		new CANPortMapping(87, 87, 87), // BRD motor
+		new CANPortMapping(88, 88, 88), // FLS motor
+		new CANPortMapping(89, 89, 89), // BLS motor
+		new CANPortMapping(90, 90, 90), // FRS motor
+		new CANPortMapping(91, 91, 91) // BRS motor
+	);
+	//CHECKSTYLE:ON
 
 	/// Feedback indexes
 
@@ -93,22 +95,31 @@ private static class CANPortMapping {
 	private static final int BEACON_SENSOR_START = 120;
 	private static final int BEACON_SENSOR_STRIDE = 6; // (x, y, z, yaw, pitch, roll)
 
-	private static final List<PortMapping> ENCODER_CHANNELS = Arrays.asList(new PortMapping(10, 0), // Left
+	//CHECKSTYLE:OFF
+	private static final List<PortMapping> ENCODER_CHANNELS = Arrays.asList(
+		new PortMapping(10, 0), // Left
 		// encoder
 		new PortMapping(11, 2), // Right encoder
 		new PortMapping(13, 4) // Mechanism encoder
 	);
+	//CHECKSTYLE:ON
+
 	private static final int GYRO_CHANNEL = 15;
 	private static final int GYRO_RATE_CHANNEL = 16;
 	private static final int GYRO_PITCH_CHANNEL = 80;
 	private static final int GYRO_ROLL_CHANNEL = 81;
-	private static final List<PortMapping> DIGITAL_CHANNELS = Arrays.asList(new PortMapping(13, 0), // Intake
+	
+	//CHECKSTYLE:OFF
+	private static final List<PortMapping> DIGITAL_CHANNELS = Arrays.asList(
+		new PortMapping(13, 0), // Intake
 		// state
 		new PortMapping(14, 1), // Ball presence
 		new PortMapping(17, 4), // Line Sensor 1
 		new PortMapping(18, 5), // Line Sensor 2
 		new PortMapping(19, 6) // Line Sensor 3
 	);
+	//CHECKSTYLE:ON
+	
 	private static final List<PortMapping> ANALOG_CHANNELS = Arrays.asList();
 
 	private static final int NUM_JOYSTICK = 4;