diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 85d707fe5a96e79407b16a31ed72fc4c39120914..6f570c88322cec4d2d5e4a25b69398ab99a69bb2 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -115,7 +115,10 @@ HEADERS += src/MG.h \
     src/ui/param/ParamTreeModel.h \
     src/ui/QGCParamWidget.h \
     src/ui/QGCSensorSettingsWidget.h \
-    src/ui/linechart/Linecharts.h
+    src/ui/linechart/Linecharts.h \
+    src/uas/SlugsMAV.h \
+    src/uas/PxQuadMAV.h \
+    src/uas/ArduPilotMAV.h
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \
@@ -164,5 +167,8 @@ SOURCES += src/main.cc \
     src/ui/param/ParamTreeModel.cc \
     src/ui/QGCParamWidget.cc \
     src/ui/QGCSensorSettingsWidget.cc \
-    src/ui/linechart/Linecharts.cc
+    src/ui/linechart/Linecharts.cc \
+    src/uas/SlugsMAV.cc \
+    src/uas/PxQuadMAV.cc \
+    src/uas/ArduPilotMAV.cc
 RESOURCES = mavground.qrc
diff --git a/src/uas/ArduPilotMAV.cc b/src/uas/ArduPilotMAV.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4fb529382d28ce2832754775bf56ee43117f70af
--- /dev/null
+++ b/src/uas/ArduPilotMAV.cc
@@ -0,0 +1,7 @@
+#include "ArduPilotMAV.h"
+
+ArduPilotMAV::ArduPilotMAV(MAVLinkProtocol* mavlink, int id) :
+        UAS(mavlink, id)//,
+        // place other initializers here
+{
+}
diff --git a/src/uas/ArduPilotMAV.h b/src/uas/ArduPilotMAV.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fda9e089190da4cd18a8b096b8a0817af911f97
--- /dev/null
+++ b/src/uas/ArduPilotMAV.h
@@ -0,0 +1,12 @@
+#ifndef ARDUPILOTMAV_H
+#define ARDUPILOTMAV_H
+
+#include "UAS.h"
+
+class ArduPilotMAV : public UAS
+{
+public:
+    ArduPilotMAV(MAVLinkProtocol* mavlink, int id = 0);
+};
+
+#endif // ARDUPILOTMAV_H
diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc
new file mode 100644
index 0000000000000000000000000000000000000000..65c2eee31d2c5a9b2149480d3709c2ba4edfee09
--- /dev/null
+++ b/src/uas/PxQuadMAV.cc
@@ -0,0 +1,6 @@
+#include "PxQuadMAV.h"
+
+PxQuadMAV::PxQuadMAV(MAVLinkProtocol* mavlink, int id) :
+        UAS(mavlink, id)
+{
+}
diff --git a/src/uas/PxQuadMAV.h b/src/uas/PxQuadMAV.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec94928867778837303976e947c2e9b6d9b5292a
--- /dev/null
+++ b/src/uas/PxQuadMAV.h
@@ -0,0 +1,12 @@
+#ifndef PXQUADMAV_H
+#define PXQUADMAV_H
+
+#include "UAS.h"
+
+class PxQuadMAV : public UAS
+{
+public:
+    PxQuadMAV(MAVLinkProtocol* mavlink, int id);
+};
+
+#endif // PXQUADMAV_H
diff --git a/src/uas/SlugsMAV.cc b/src/uas/SlugsMAV.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4c10f501668b249e3fe4e2ebe793a7503afca492
--- /dev/null
+++ b/src/uas/SlugsMAV.cc
@@ -0,0 +1,23 @@
+#include "SlugsMAV.h"
+
+SlugsMAV::SlugsMAV(MAVLinkProtocol* mavlink, int id) :
+        UAS(mavlink, id)//,
+        // Place other initializers here
+{
+}
+
+
+void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
+{
+    switch (message.msgid)
+    {
+    case MAVLINK_MSG_ID_HEARTBEAT:
+        {
+            printf("RECEIVED HEARTBEAT");
+            break;
+        }
+    default:
+        printf("\nSLUGS RECEIVED MESSAGE WITH ID %d", message.msgid);
+        break;
+    }
+}
diff --git a/src/uas/SlugsMAV.h b/src/uas/SlugsMAV.h
new file mode 100644
index 0000000000000000000000000000000000000000..e4d87146381d8a2cd25e1a75d726490b5e73f408
--- /dev/null
+++ b/src/uas/SlugsMAV.h
@@ -0,0 +1,15 @@
+#ifndef SLUGSMAV_H
+#define SLUGSMAV_H
+
+#include "UAS.h"
+
+class SlugsMAV : public UAS
+{
+public:
+    SlugsMAV(MAVLinkProtocol* mavlink, int id = 0);
+
+public slots:
+    void receiveMessage(LinkInterface* link, mavlink_message_t message);
+};
+
+#endif // SLUGSMAV_H
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index e48508601a39eec8f95fe47250444f5cf6ab717d..8c43b3ef1fbaf48189e609bc0dfe10731d77b36a 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -144,7 +144,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 mavlink_msg_sys_status_decode(&message, &state);
 
                 // FIXME
-                qDebug() << "SYSTEM NAV MODE:" << state.nav_mode;
+                //qDebug() << "SYSTEM NAV MODE:" << state.nav_mode;
 
                 QString audiostring = "System " + QString::number(this->getUASID());
                 QString stateAudio = "";