diff --git a/wpilibcExamples/src/main/cpp/commands/commands.json b/wpilibcExamples/src/main/cpp/commands/commands.json
index 8d9c1e588a..bb8cbb6950 100644
--- a/wpilibcExamples/src/main/cpp/commands/commands.json
+++ b/wpilibcExamples/src/main/cpp/commands/commands.json
@@ -1,4 +1,19 @@
 [
+  {
+    "name": "Empty Class",
+    "description": "Create an empty command",
+    "tags": [
+      "class"
+    ],
+    "foldername": "emptyclass",
+    "headers": [
+      "ReplaceMeEmptyClass.h"
+    ],
+    "source": [
+      "ReplaceMeEmptyClass.cpp"
+    ],
+    "replacename": "ReplaceMeEmptyClass"
+  },
   {
     "name": "Command",
     "description": "Create a base command",
diff --git a/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.cpp b/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.cpp
new file mode 100644
index 0000000000..4ff8ad8e58
--- /dev/null
+++ b/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.cpp
@@ -0,0 +1,10 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#include "ReplaceMeEmptyClass.h"
+
+ReplaceMeEmptyClass::ReplaceMeEmptyClass() {}
diff --git a/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.h b/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.h
new file mode 100644
index 0000000000..131edabbaa
--- /dev/null
+++ b/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.h
@@ -0,0 +1,13 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+class ReplaceMeEmptyClass {
+ public:
+  ReplaceMeEmptyClass();
+};
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json
index dc50d97e56..289492658e 100644
--- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json
@@ -1,4 +1,13 @@
 [
+  {
+    "name": "Empty Class",
+    "description": "Create an empty class",
+    "tags": [
+      "class"
+    ],
+    "foldername": "emptyclass",
+    "replacename": "ReplaceMeEmptyClass"
+  },
   {
     "name": "Command",
     "description": "Create a base command",
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/emptyclass/ReplaceMeEmptyClass.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/emptyclass/ReplaceMeEmptyClass.java
new file mode 100644
index 0000000000..94983484e5
--- /dev/null
+++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/emptyclass/ReplaceMeEmptyClass.java
@@ -0,0 +1,14 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2018 FIRST. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package edu.wpi.first.wpilibj.commands.emptyclass;
+
+/**
+ * Add your docs here.
+ */
+public class ReplaceMeEmptyClass {
+}