diff --git a/build.gradle b/build.gradle
index 322a386..42ac19f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "java"
     id "edu.wpi.first.GradleRIO" version "2026.2.1"
+    id "com.peterabeles.gversion" version "1.11.0"
 }
 
 java {
@@ -105,3 +106,12 @@ wpi.java.configureTestTasks(test)
 tasks.withType(JavaCompile) {
     options.compilerArgs.add '-XDstringConcat=inline'
 }
+project.compileJava.dependsOn(createVersionFile)
+gversion {
+    srcDir = "src/main/java/"
+    classPackage = "frc.robot" 
+    className = "BuildConstants"
+    dateFormat = "yyyy-MM-dd HH:mm:ss z"
+    timeZone = "America/Chicago"
+    indent = "    "
+}
\ No newline at end of file
diff --git a/src/main/java/frc/robot/BuildConstants.java b/src/main/java/frc/robot/BuildConstants.java
new file mode 100644
index 0000000..b37b2f6
--- /dev/null
+++ b/src/main/java/frc/robot/BuildConstants.java
@@ -0,0 +1,19 @@
+package frc.robot;
+
+/**
+ * Automatically generated build version information. Do not modify.
+ */
+public final class BuildConstants {
+    public static final String MAVEN_GROUP = "";
+    public static final String MAVEN_NAME = "robot-base";
+    public static final String VERSION = "unspecified";
+    public static final int GIT_REVISION = 701;
+    public static final String GIT_SHA = "79d8d5e24169a9e141f6ee401ebfc31a1be7b4f0";
+    public static final String GIT_DATE = "2026-05-26 13:48:56 CDT";
+    public static final String GIT_BRANCH = "Main-branch-bug-fixes";
+    public static final String BUILD_DATE = "2026-06-04 18:31:36 CDT";
+    public static final long BUILD_UNIX_TIME = 1780615896475L;
+    public static final int DIRTY = 1;
+
+    private BuildConstants(){}
+}
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
index 67e0690..de706f8 100644
--- a/src/main/java/frc/robot/Robot.java
+++ b/src/main/java/frc/robot/Robot.java
@@ -79,24 +79,24 @@ public Robot() {
   public void robotInit() {
     m_robotContainer = new RobotContainer();
     // Put git/code version metadata on networktables
-    NetworkTable versionTable = NetworkTableInstance.getDefault()
-        .getTable("Version");
-    versionTable.putValue(
-        "GIT_SHA",
-        NetworkTableValue.makeString(BuildConstants.GIT_SHA)
-    );
-    versionTable.putValue(
-        "BUILD_DATE",
-        NetworkTableValue.makeString(BuildConstants.BUILD_DATE)
-    );
-    versionTable.putValue(
-        "GIT_BRANCH",
-        NetworkTableValue.makeString(BuildConstants.GIT_BRANCH)
-    );
-    versionTable.putValue(
-        "DIRTY",
-        NetworkTableValue.makeBoolean(BuildConstants.DIRTY != 0)
-    );
+    // NetworkTable versionTable = NetworkTableInstance.getDefault()
+    //     .getTable("Version");
+    // versionTable.putValue(
+    //     "GIT_SHA",
+    //     NetworkTableValue.makeString(BuildConstants.GIT_SHA)
+    // );
+    // versionTable.putValue(
+    //     "BUILD_DATE",
+    //     NetworkTableValue.makeString(BuildConstants.BUILD_DATE)
+    // );
+    // versionTable.putValue(
+    //     "GIT_BRANCH",
+    //     NetworkTableValue.makeString(BuildConstants.GIT_BRANCH)
+    // );
+    // versionTable.putValue(
+    //     "DIRTY",
+    //     NetworkTableValue.makeBoolean(BuildConstants.DIRTY != 0)
+    // );
 
     WebServer.start(5800, Filesystem.getDeployDirectory().getPath());
 
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 918d124..5360faf 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -40,7 +40,7 @@
 import frc.robot.Constants.MetaConstants;
 import frc.robot.Constants.RobotConstants;
 import frc.robot.commands.control.DriveCommand;
-import frc.robot.commands.util.MatchtimeStatusCommand;
+
 import frc.robot.commands.util.VoltageStatusCommand;
 import frc.robot.Constants.DriveConstants;
 import frc.robot.subsystems.limelight.LimelightSubsystem;
@@ -137,8 +137,7 @@ private static void configureCommands() {
                         Elastic.selectTab("Autonomous");
                     }),
 
-                    new VoltageStatusCommand(),
-                    new MatchtimeStatusCommand()
+                    new VoltageStatusCommand()
                 )
             );
 
diff --git a/src/main/java/frc/robot/commands/control/DriveCommand.java b/src/main/java/frc/robot/commands/control/DriveCommand.java
index ec16e52..41fab00 100644
--- a/src/main/java/frc/robot/commands/control/DriveCommand.java
+++ b/src/main/java/frc/robot/commands/control/DriveCommand.java
@@ -9,7 +9,7 @@
 import edu.wpi.first.wpilibj.XboxController;
 
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-import frc.robot.subsystems.SwerveSubsystem;
+import frc.robot.subsystems.drive.SwerveSubsystem;
 import frc.robot.Constants.DriveConstants;
 import frc.robot.Constants.MetaConstants;