diff --git a/rigcommander.h b/rigcommander.h
index aa6db7c..80e0879 100644
--- a/rigcommander.h
+++ b/rigcommander.h
@@ -40,6 +40,11 @@ struct freqt {
     double MHzDouble;
 };
 
+struct rigStateStruct {
+    freqt vfoAFreq;
+    freqt vfoBFreq;
+};
+
 class rigCommander : public QObject
 {
     Q_OBJECT
@@ -345,6 +350,9 @@ private:
     double spectrumEndFreq;
 
     struct rigCapabilities rigCaps;
+    
+    rigStateStruct rigState;
+
     bool haveRigCaps;
     model_kind model;
     quint8 spectSeqMax;
diff --git a/rigctld.cpp b/rigctld.cpp
index 801cf12..d14c248 100644
--- a/rigctld.cpp
+++ b/rigctld.cpp
@@ -68,13 +68,12 @@ void rigCtlClient::socketReadyRead()
     {
         // Process command
         qDebug(logRigCtlD()) << sessionId << "command received" << commandBuffer;
-        QString cmd = commandBuffer[0];
 
-        if (cmd.toLower() == "q")
+        if (commandBuffer[0].toLower() == "q")
         {
             closeSocket();
         }
-        else if (cmd == "1")
+        else if (commandBuffer[0] == "1")
         {
             dumpCaps();
         }
diff --git a/wfmain.h b/wfmain.h
index 5643c0a..c33d4e8 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -552,6 +552,7 @@ private:
     preferences defPrefs;
     udpPreferences udpPrefs;
     udpPreferences udpDefPrefs;
+
     colors defaultColors;
 
     void setDefaultColors(); // populate with default values