diff --git a/src/DCCEXLoco.cpp b/src/DCCEXLoco.cpp
index bdf3f6f..cc2c750 100644
--- a/src/DCCEXLoco.cpp
+++ b/src/DCCEXLoco.cpp
@@ -124,13 +124,17 @@ void Loco::setupFunctions(char *functionNames) {
         _momentaryFlags &= ~1<<fkey;
       }
     }
-    //    console->print("Function ");
-    //    console->print(fkey);
-    //    console->print(momentary ? F("  Momentary ") : F(""));
-    //    console->print(" ");
-    //    console->println(fName);
+    //  Serial.print("Function ");
+    //  Serial.print(fkey);
+    //  Serial.print(momentary ? F("  Momentary ") : F(""));
+    //  Serial.print(" ");
+    //  Serial.println(fName);
+    //  Serial.println(_functionNames[fkey]); 
     fkey++;
   }
+  if (fkey<MAX_FUNCTIONS) {
+    for (int i=fkey; i<MAX_FUNCTIONS; i++) {_functionNames[i] = nullptr;}
+  }
 }
 
 bool Loco::isFunctionOn(int function) {
@@ -145,6 +149,10 @@ int Loco::getFunctionStates() {
   return _functionStates;
 }
 
+char* Loco::getFunctionName(int function) {
+  return _functionNames[function];
+}
+
 Loco* Loco::getFirst() {
   return _first;
 }
diff --git a/src/DCCEXLoco.h b/src/DCCEXLoco.h
index b0c1d1c..91f0c12 100644
--- a/src/DCCEXLoco.h
+++ b/src/DCCEXLoco.h
@@ -107,6 +107,11 @@ class Loco {
   /// @return Integer representing current function states
   int getFunctionStates();
 
+  /// @brief Get the name/label for a function
+  /// @param function Number of the function to return the name/label of
+  /// @return char* representing the function name/label
+  char* getFunctionName(int function);
+
   /// @brief Get first Loco object
   /// @return Pointer to the first Loco object
   static Loco* getFirst();
@@ -235,6 +240,7 @@ class Consist {
   ConsistLoco* getFirst();
 
   /// @brief Get the loco in the consist with the specified address
+  /// @param address DCC address of loco to retrieve
   /// @return Pointer to the first ConsistLoco object
   ConsistLoco* getByAddress(int address);