diff --git a/command.cpp b/command.cpp
index 90680f32..d0da0def 100644
--- a/command.cpp
+++ b/command.cpp
@@ -20,194 +20,194 @@ namespace simulation {
 command_queue Commands;
 commanddescription_sequence Commands_descriptions = {
 
-    { "aidriverenable", command_target::vehicle },
-    { "aidriverdisable", command_target::vehicle },
-    { "mastercontrollerincrease", command_target::vehicle },
-    { "mastercontrollerincreasefast", command_target::vehicle },
-    { "mastercontrollerdecrease", command_target::vehicle },
-    { "mastercontrollerdecreasefast", command_target::vehicle },
-    { "mastercontrollerset", command_target::vehicle },
-    { "secondcontrollerincrease", command_target::vehicle },
-    { "secondcontrollerincreasefast", command_target::vehicle },
-    { "secondcontrollerdecrease", command_target::vehicle },
-    { "secondcontrollerdecreasefast", command_target::vehicle },
-    { "secondcontrollerset", command_target::vehicle },
-    { "mucurrentindicatorothersourceactivate", command_target::vehicle },
-    { "independentbrakeincrease", command_target::vehicle },
-    { "independentbrakeincreasefast", command_target::vehicle },
-    { "independentbrakedecrease", command_target::vehicle },
-    { "independentbrakedecreasefast", command_target::vehicle },
-    { "independentbrakeset", command_target::vehicle },
-    { "independentbrakebailoff", command_target::vehicle },
+    { "aidriverenable", command_target::vehicle, command_mode::oneoff },
+    { "aidriverdisable", command_target::vehicle, command_mode::oneoff },
+    { "mastercontrollerincrease", command_target::vehicle, command_mode::oneoff },
+    { "mastercontrollerincreasefast", command_target::vehicle, command_mode::oneoff },
+    { "mastercontrollerdecrease", command_target::vehicle, command_mode::oneoff },
+    { "mastercontrollerdecreasefast", command_target::vehicle, command_mode::oneoff },
+    { "mastercontrollerset", command_target::vehicle, command_mode::oneoff },
+    { "secondcontrollerincrease", command_target::vehicle, command_mode::oneoff },
+    { "secondcontrollerincreasefast", command_target::vehicle, command_mode::oneoff },
+    { "secondcontrollerdecrease", command_target::vehicle, command_mode::oneoff },
+    { "secondcontrollerdecreasefast", command_target::vehicle, command_mode::oneoff },
+    { "secondcontrollerset", command_target::vehicle, command_mode::oneoff },
+    { "mucurrentindicatorothersourceactivate", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakeincrease", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakeincreasefast", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakedecrease", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakedecreasefast", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakeset", command_target::vehicle, command_mode::oneoff },
+    { "independentbrakebailoff", command_target::vehicle, command_mode::oneoff },
     { "trainbrakeincrease", command_target::vehicle, command_mode::continuous },
     { "trainbrakedecrease", command_target::vehicle, command_mode::continuous },
-    { "trainbrakeset", command_target::vehicle },
-    { "trainbrakecharging", command_target::vehicle },
-    { "trainbrakerelease", command_target::vehicle },
-    { "trainbrakefirstservice", command_target::vehicle },
-    { "trainbrakeservice", command_target::vehicle },
-    { "trainbrakefullservice", command_target::vehicle },
-    { "trainbrakehandleoff", command_target::vehicle },
-    { "trainbrakeemergency", command_target::vehicle },
-    { "trainbrakebasepressureincrease", command_target::vehicle },
-    { "trainbrakebasepressuredecrease", command_target::vehicle },
-    { "trainbrakebasepressurereset", command_target::vehicle },
-    { "trainbrakeoperationtoggle", command_target::vehicle },
-    { "manualbrakeincrease", command_target::vehicle },
-    { "manualbrakedecrease", command_target::vehicle },
-    { "alarmchaintoggle", command_target::vehicle },
-    { "wheelspinbrakeactivate", command_target::vehicle },
-    { "sandboxactivate", command_target::vehicle },
-    { "reverserincrease", command_target::vehicle },
-    { "reverserdecrease", command_target::vehicle },
-    { "reverserforwardhigh", command_target::vehicle },
-    { "reverserforward", command_target::vehicle },
-    { "reverserneutral", command_target::vehicle },
-    { "reverserbackward", command_target::vehicle },
-    { "waterpumpbreakertoggle", command_target::vehicle },
-    { "waterpumpbreakerclose", command_target::vehicle },
-    { "waterpumpbreakeropen", command_target::vehicle },
-    { "waterpumptoggle", command_target::vehicle },
-    { "waterpumpenable", command_target::vehicle },
-    { "waterpumpdisable", command_target::vehicle },
-    { "waterheaterbreakertoggle", command_target::vehicle },
-    { "waterheaterbreakerclose", command_target::vehicle },
-    { "waterheaterbreakeropen", command_target::vehicle },
-    { "waterheatertoggle", command_target::vehicle },
-    { "waterheaterenable", command_target::vehicle },
-    { "waterheaterdisable", command_target::vehicle },
-    { "watercircuitslinktoggle", command_target::vehicle },
-    { "watercircuitslinkenable", command_target::vehicle },
-    { "watercircuitslinkdisable", command_target::vehicle },
-    { "fuelpumptoggle", command_target::vehicle },
-    { "fuelpumpenable", command_target::vehicle },
-    { "fuelpumpdisable", command_target::vehicle },
-    { "oilpumptoggle", command_target::vehicle },
-    { "oilpumpenable", command_target::vehicle },
-    { "oilpumpdisable", command_target::vehicle },
-    { "linebreakertoggle", command_target::vehicle },
-    { "linebreakeropen", command_target::vehicle },
-    { "linebreakerclose", command_target::vehicle },
-    { "convertertoggle", command_target::vehicle },
-    { "converterenable", command_target::vehicle },
-    { "converterdisable", command_target::vehicle },
-    { "convertertogglelocal", command_target::vehicle },
-    { "converteroverloadrelayreset", command_target::vehicle },
-    { "compressortoggle", command_target::vehicle },
-    { "compressorenable", command_target::vehicle },
-    { "compressordisable", command_target::vehicle },
-    { "compressortogglelocal", command_target::vehicle },
-    { "motoroverloadrelaythresholdtoggle", command_target::vehicle },
-    { "motoroverloadrelaythresholdsetlow", command_target::vehicle },
-    { "motoroverloadrelaythresholdsethigh", command_target::vehicle },
-    { "motoroverloadrelayreset", command_target::vehicle },
-    { "notchingrelaytoggle", command_target::vehicle },
-    { "epbrakecontroltoggle", command_target::vehicle },
-	{ "trainbrakeoperationmodeincrease", command_target::vehicle },
-	{ "trainbrakeoperationmodedecrease", command_target::vehicle },
-    { "brakeactingspeedincrease", command_target::vehicle },
-    { "brakeactingspeeddecrease", command_target::vehicle },
-    { "brakeactingspeedsetcargo", command_target::vehicle },
-    { "brakeactingspeedsetpassenger", command_target::vehicle },
-    { "brakeactingspeedsetrapid", command_target::vehicle },
-    { "brakeloadcompensationincrease", command_target::vehicle },
-    { "brakeloadcompensationdecrease", command_target::vehicle },
-    { "mubrakingindicatortoggle", command_target::vehicle },
-    { "alerteracknowledge", command_target::vehicle },
-    { "hornlowactivate", command_target::vehicle },
-    { "hornhighactivate", command_target::vehicle },
-    { "whistleactivate", command_target::vehicle },
-    { "radiotoggle", command_target::vehicle },
-    { "radiochannelincrease", command_target::vehicle },
-    { "radiochanneldecrease", command_target::vehicle },
-    { "radiostopsend", command_target::vehicle },
-    { "radiostoptest", command_target::vehicle },
+    { "trainbrakeset", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakecharging", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakerelease", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakefirstservice", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakeservice", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakefullservice", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakehandleoff", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakeemergency", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakebasepressureincrease", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakebasepressuredecrease", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakebasepressurereset", command_target::vehicle, command_mode::oneoff },
+    { "trainbrakeoperationtoggle", command_target::vehicle, command_mode::oneoff },
+    { "manualbrakeincrease", command_target::vehicle, command_mode::oneoff },
+    { "manualbrakedecrease", command_target::vehicle, command_mode::oneoff },
+    { "alarmchaintoggle", command_target::vehicle, command_mode::oneoff },
+    { "wheelspinbrakeactivate", command_target::vehicle, command_mode::oneoff },
+    { "sandboxactivate", command_target::vehicle, command_mode::oneoff },
+    { "reverserincrease", command_target::vehicle, command_mode::oneoff },
+    { "reverserdecrease", command_target::vehicle, command_mode::oneoff },
+    { "reverserforwardhigh", command_target::vehicle, command_mode::oneoff },
+    { "reverserforward", command_target::vehicle, command_mode::oneoff },
+    { "reverserneutral", command_target::vehicle, command_mode::oneoff },
+    { "reverserbackward", command_target::vehicle, command_mode::oneoff },
+    { "waterpumpbreakertoggle", command_target::vehicle, command_mode::oneoff },
+    { "waterpumpbreakerclose", command_target::vehicle, command_mode::oneoff },
+    { "waterpumpbreakeropen", command_target::vehicle, command_mode::oneoff },
+    { "waterpumptoggle", command_target::vehicle, command_mode::oneoff },
+    { "waterpumpenable", command_target::vehicle, command_mode::oneoff },
+    { "waterpumpdisable", command_target::vehicle, command_mode::oneoff },
+    { "waterheaterbreakertoggle", command_target::vehicle, command_mode::oneoff },
+    { "waterheaterbreakerclose", command_target::vehicle, command_mode::oneoff },
+    { "waterheaterbreakeropen", command_target::vehicle, command_mode::oneoff },
+    { "waterheatertoggle", command_target::vehicle, command_mode::oneoff },
+    { "waterheaterenable", command_target::vehicle, command_mode::oneoff },
+    { "waterheaterdisable", command_target::vehicle, command_mode::oneoff },
+    { "watercircuitslinktoggle", command_target::vehicle, command_mode::oneoff },
+    { "watercircuitslinkenable", command_target::vehicle, command_mode::oneoff },
+    { "watercircuitslinkdisable", command_target::vehicle, command_mode::oneoff },
+    { "fuelpumptoggle", command_target::vehicle, command_mode::oneoff },
+    { "fuelpumpenable", command_target::vehicle, command_mode::oneoff },
+    { "fuelpumpdisable", command_target::vehicle, command_mode::oneoff },
+    { "oilpumptoggle", command_target::vehicle, command_mode::oneoff },
+    { "oilpumpenable", command_target::vehicle, command_mode::oneoff },
+    { "oilpumpdisable", command_target::vehicle, command_mode::oneoff },
+    { "linebreakertoggle", command_target::vehicle, command_mode::oneoff },
+    { "linebreakeropen", command_target::vehicle, command_mode::oneoff },
+    { "linebreakerclose", command_target::vehicle, command_mode::oneoff },
+    { "convertertoggle", command_target::vehicle, command_mode::oneoff },
+    { "converterenable", command_target::vehicle, command_mode::oneoff },
+    { "converterdisable", command_target::vehicle, command_mode::oneoff },
+    { "convertertogglelocal", command_target::vehicle, command_mode::oneoff },
+    { "converteroverloadrelayreset", command_target::vehicle, command_mode::oneoff },
+    { "compressortoggle", command_target::vehicle, command_mode::oneoff },
+    { "compressorenable", command_target::vehicle, command_mode::oneoff },
+    { "compressordisable", command_target::vehicle, command_mode::oneoff },
+    { "compressortogglelocal", command_target::vehicle, command_mode::oneoff },
+    { "motoroverloadrelaythresholdtoggle", command_target::vehicle, command_mode::oneoff },
+    { "motoroverloadrelaythresholdsetlow", command_target::vehicle, command_mode::oneoff },
+    { "motoroverloadrelaythresholdsethigh", command_target::vehicle, command_mode::oneoff },
+    { "motoroverloadrelayreset", command_target::vehicle, command_mode::oneoff },
+    { "notchingrelaytoggle", command_target::vehicle, command_mode::oneoff },
+    { "epbrakecontroltoggle", command_target::vehicle, command_mode::oneoff },
+	{ "trainbrakeoperationmodeincrease", command_target::vehicle, command_mode::oneoff },
+	{ "trainbrakeoperationmodedecrease", command_target::vehicle, command_mode::oneoff },
+    { "brakeactingspeedincrease", command_target::vehicle, command_mode::oneoff },
+    { "brakeactingspeeddecrease", command_target::vehicle, command_mode::oneoff },
+    { "brakeactingspeedsetcargo", command_target::vehicle, command_mode::oneoff },
+    { "brakeactingspeedsetpassenger", command_target::vehicle, command_mode::oneoff },
+    { "brakeactingspeedsetrapid", command_target::vehicle, command_mode::oneoff },
+    { "brakeloadcompensationincrease", command_target::vehicle, command_mode::oneoff },
+    { "brakeloadcompensationdecrease", command_target::vehicle, command_mode::oneoff },
+    { "mubrakingindicatortoggle", command_target::vehicle, command_mode::oneoff },
+    { "alerteracknowledge", command_target::vehicle, command_mode::oneoff },
+    { "hornlowactivate", command_target::vehicle, command_mode::oneoff },
+    { "hornhighactivate", command_target::vehicle, command_mode::oneoff },
+    { "whistleactivate", command_target::vehicle, command_mode::oneoff },
+    { "radiotoggle", command_target::vehicle, command_mode::oneoff },
+    { "radiochannelincrease", command_target::vehicle, command_mode::oneoff },
+    { "radiochanneldecrease", command_target::vehicle, command_mode::oneoff },
+    { "radiostopsend", command_target::vehicle, command_mode::oneoff },
+    { "radiostoptest", command_target::vehicle, command_mode::oneoff },
     // TBD, TODO: make cab change controls entity-centric
-    { "cabchangeforward", command_target::vehicle },
-    { "cabchangebackward", command_target::vehicle },
+    { "cabchangeforward", command_target::vehicle, command_mode::oneoff },
+    { "cabchangebackward", command_target::vehicle, command_mode::oneoff },
 
-    { "viewturn", command_target::entity },
-    { "movehorizontal", command_target::entity },
-    { "movehorizontalfast", command_target::entity },
-    { "movevertical", command_target::entity },
-    { "moveverticalfast", command_target::entity },
-    { "moveleft", command_target::entity },
-    { "moveright", command_target::entity },
-    { "moveforward", command_target::entity },
-    { "moveback", command_target::entity },
-    { "moveup", command_target::entity },
-    { "movedown", command_target::entity },
+    { "viewturn", command_target::entity, command_mode::oneoff },
+    { "movehorizontal", command_target::entity, command_mode::oneoff },
+    { "movehorizontalfast", command_target::entity, command_mode::oneoff },
+    { "movevertical", command_target::entity, command_mode::oneoff },
+    { "moveverticalfast", command_target::entity, command_mode::oneoff },
+    { "moveleft", command_target::entity, command_mode::oneoff },
+    { "moveright", command_target::entity, command_mode::oneoff },
+    { "moveforward", command_target::entity, command_mode::oneoff },
+    { "moveback", command_target::entity, command_mode::oneoff },
+    { "moveup", command_target::entity, command_mode::oneoff },
+    { "movedown", command_target::entity, command_mode::oneoff },
     // TBD, TODO: make coupling controls entity-centric
-    { "carcouplingincrease", command_target::vehicle },
-    { "carcouplingdisconnect", command_target::vehicle },
-    { "doortoggleleft", command_target::vehicle },
-    { "doortoggleright", command_target::vehicle },
-    { "departureannounce", command_target::vehicle },
-    { "doorlocktoggle", command_target::vehicle },
-    { "pantographcompressorvalvetoggle", command_target::vehicle },
-    { "pantographcompressoractivate", command_target::vehicle },
-    { "pantographtogglefront", command_target::vehicle },
-    { "pantographtogglerear", command_target::vehicle },
-    { "pantographraisefront", command_target::vehicle },
-    { "pantographraiserear", command_target::vehicle },
-    { "pantographlowerfront", command_target::vehicle },
-    { "pantographlowerrear", command_target::vehicle },
-    { "pantographlowerall", command_target::vehicle },
-    { "heatingtoggle", command_target::vehicle },
-    { "heatingenable", command_target::vehicle },
-    { "heatingdisable", command_target::vehicle },
-    { "lightspresetactivatenext", command_target::vehicle },
-    { "lightspresetactivateprevious", command_target::vehicle },
-    { "headlighttoggleleft", command_target::vehicle },
-    { "headlightenableleft", command_target::vehicle },
-    { "headlightdisableleft", command_target::vehicle },
-    { "headlighttoggleright", command_target::vehicle },
-    { "headlightenableright", command_target::vehicle },
-    { "headlightdisableright", command_target::vehicle },
-    { "headlighttoggleupper", command_target::vehicle },
-    { "headlightenableupper", command_target::vehicle },
-    { "headlightdisableupper", command_target::vehicle },
-    { "redmarkertoggleleft", command_target::vehicle },
-    { "redmarkerenableleft", command_target::vehicle },
-    { "redmarkerdisableleft", command_target::vehicle },
-    { "redmarkertoggleright", command_target::vehicle },
-    { "redmarkerenableright", command_target::vehicle },
-    { "redmarkerdisableright", command_target::vehicle },
-    { "headlighttogglerearleft", command_target::vehicle },
-    { "headlighttogglerearright", command_target::vehicle },
-    { "headlighttogglerearupper", command_target::vehicle },
-    { "redmarkertogglerearleft", command_target::vehicle },
-    { "redmarkertogglerearright", command_target::vehicle },
-    { "redmarkerstoggle", command_target::vehicle },
-    { "endsignalstoggle", command_target::vehicle },
-    { "headlightsdimtoggle", command_target::vehicle },
-    { "headlightsdimenable", command_target::vehicle },
-    { "headlightsdimdisable", command_target::vehicle },
-    { "motorconnectorsopen", command_target::vehicle },
-    { "motorconnectorsclose", command_target::vehicle },
-    { "motordisconnect", command_target::vehicle },
-    { "interiorlighttoggle", command_target::vehicle },
-    { "interiorlightenable", command_target::vehicle },
-    { "interiorlightdisable", command_target::vehicle },
-    { "interiorlightdimtoggle", command_target::vehicle },
-    { "interiorlightdimenable", command_target::vehicle },
-    { "interiorlightdimdisable", command_target::vehicle },
-    { "instrumentlighttoggle", command_target::vehicle },
-    { "instrumentlightenable", command_target::vehicle },
-    { "instrumentlightdisable", command_target::vehicle },
-    { "generictoggle0", command_target::vehicle },
-    { "generictoggle1", command_target::vehicle },
-    { "generictoggle2", command_target::vehicle },
-    { "generictoggle3", command_target::vehicle },
-    { "generictoggle4", command_target::vehicle },
-    { "generictoggle5", command_target::vehicle },
-    { "generictoggle6", command_target::vehicle },
-    { "generictoggle7", command_target::vehicle },
-    { "generictoggle8", command_target::vehicle },
-    { "generictoggle9", command_target::vehicle },
-    { "batterytoggle", command_target::vehicle },
-    { "batteryenable", command_target::vehicle },
-    { "batterydisable", command_target::vehicle }
+    { "carcouplingincrease", command_target::vehicle, command_mode::oneoff },
+    { "carcouplingdisconnect", command_target::vehicle, command_mode::oneoff },
+    { "doortoggleleft", command_target::vehicle, command_mode::oneoff },
+    { "doortoggleright", command_target::vehicle, command_mode::oneoff },
+    { "departureannounce", command_target::vehicle, command_mode::oneoff },
+    { "doorlocktoggle", command_target::vehicle, command_mode::oneoff },
+    { "pantographcompressorvalvetoggle", command_target::vehicle, command_mode::oneoff },
+    { "pantographcompressoractivate", command_target::vehicle, command_mode::oneoff },
+    { "pantographtogglefront", command_target::vehicle, command_mode::oneoff },
+    { "pantographtogglerear", command_target::vehicle, command_mode::oneoff },
+    { "pantographraisefront", command_target::vehicle, command_mode::oneoff },
+    { "pantographraiserear", command_target::vehicle, command_mode::oneoff },
+    { "pantographlowerfront", command_target::vehicle, command_mode::oneoff },
+    { "pantographlowerrear", command_target::vehicle, command_mode::oneoff },
+    { "pantographlowerall", command_target::vehicle, command_mode::oneoff },
+    { "heatingtoggle", command_target::vehicle, command_mode::oneoff },
+    { "heatingenable", command_target::vehicle, command_mode::oneoff },
+    { "heatingdisable", command_target::vehicle, command_mode::oneoff },
+    { "lightspresetactivatenext", command_target::vehicle, command_mode::oneoff },
+    { "lightspresetactivateprevious", command_target::vehicle, command_mode::oneoff },
+    { "headlighttoggleleft", command_target::vehicle, command_mode::oneoff },
+    { "headlightenableleft", command_target::vehicle, command_mode::oneoff },
+    { "headlightdisableleft", command_target::vehicle, command_mode::oneoff },
+    { "headlighttoggleright", command_target::vehicle, command_mode::oneoff },
+    { "headlightenableright", command_target::vehicle, command_mode::oneoff },
+    { "headlightdisableright", command_target::vehicle, command_mode::oneoff },
+    { "headlighttoggleupper", command_target::vehicle, command_mode::oneoff },
+    { "headlightenableupper", command_target::vehicle, command_mode::oneoff },
+    { "headlightdisableupper", command_target::vehicle, command_mode::oneoff },
+    { "redmarkertoggleleft", command_target::vehicle, command_mode::oneoff },
+    { "redmarkerenableleft", command_target::vehicle, command_mode::oneoff },
+    { "redmarkerdisableleft", command_target::vehicle, command_mode::oneoff },
+    { "redmarkertoggleright", command_target::vehicle, command_mode::oneoff },
+    { "redmarkerenableright", command_target::vehicle, command_mode::oneoff },
+    { "redmarkerdisableright", command_target::vehicle, command_mode::oneoff },
+    { "headlighttogglerearleft", command_target::vehicle, command_mode::oneoff },
+    { "headlighttogglerearright", command_target::vehicle, command_mode::oneoff },
+    { "headlighttogglerearupper", command_target::vehicle, command_mode::oneoff },
+    { "redmarkertogglerearleft", command_target::vehicle, command_mode::oneoff },
+    { "redmarkertogglerearright", command_target::vehicle, command_mode::oneoff },
+    { "redmarkerstoggle", command_target::vehicle, command_mode::oneoff },
+    { "endsignalstoggle", command_target::vehicle, command_mode::oneoff },
+    { "headlightsdimtoggle", command_target::vehicle, command_mode::oneoff },
+    { "headlightsdimenable", command_target::vehicle, command_mode::oneoff },
+    { "headlightsdimdisable", command_target::vehicle, command_mode::oneoff },
+    { "motorconnectorsopen", command_target::vehicle, command_mode::oneoff },
+    { "motorconnectorsclose", command_target::vehicle, command_mode::oneoff },
+    { "motordisconnect", command_target::vehicle, command_mode::oneoff },
+    { "interiorlighttoggle", command_target::vehicle, command_mode::oneoff },
+    { "interiorlightenable", command_target::vehicle, command_mode::oneoff },
+    { "interiorlightdisable", command_target::vehicle, command_mode::oneoff },
+    { "interiorlightdimtoggle", command_target::vehicle, command_mode::oneoff },
+    { "interiorlightdimenable", command_target::vehicle, command_mode::oneoff },
+    { "interiorlightdimdisable", command_target::vehicle, command_mode::oneoff },
+    { "instrumentlighttoggle", command_target::vehicle, command_mode::oneoff },
+    { "instrumentlightenable", command_target::vehicle, command_mode::oneoff },
+    { "instrumentlightdisable", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle0", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle1", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle2", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle3", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle4", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle5", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle6", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle7", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle8", command_target::vehicle, command_mode::oneoff },
+    { "generictoggle9", command_target::vehicle, command_mode::oneoff },
+    { "batterytoggle", command_target::vehicle, command_mode::oneoff },
+    { "batteryenable", command_target::vehicle, command_mode::oneoff },
+    { "batterydisable", command_target::vehicle, command_mode::oneoff }
 };
 
 }
diff --git a/command.h b/command.h
index c405d59a..7065ea2e 100644
--- a/command.h
+++ b/command.h
@@ -230,7 +230,7 @@ enum class command_mode {
 struct command_description {
     std::string name;
     command_target target;
-	command_mode mode = command_mode::oneoff;
+	command_mode mode;
 };
 
 struct command_data {