diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 14a1fc5..13229cc 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(libevents)
 add_subdirectory(qtandroidserialport)
 add_subdirectory(shapelib)
 if (WIN32)
diff --git a/libs/libevents/CMakeLists.txt b/libs/libevents/CMakeLists.txt
new file mode 100644
index 0000000..204f038
--- /dev/null
+++ b/libs/libevents/CMakeLists.txt
@@ -0,0 +1,13 @@
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
+add_library(libevents_generated)
+target_include_directories(libevents_generated INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libevents/libs/cpp/generated)
+
+add_library(libevents_parser
+        definitions.cpp
+        libevents/libs/cpp/parse/parser.cpp
+        libevents/libs/cpp/protocol/receive.cpp
+        )
+target_include_directories(libevents_parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(libevents_parser PUBLIC Qt5::Core)
+target_link_libraries(libevents_parser PUBLIC comm)
\ No newline at end of file
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index bef84fe..4993f86 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -18,6 +18,8 @@ endif()
 add_library(Vehicle
 	CompInfo.cc
 	CompInfo.h
+	CompInfoEvents.cc
+	CompInfoEvents.h
 	CompInfoParam.cc
 	CompInfoParam.h
 	CompInfoGeneral.cc
@@ -26,10 +28,14 @@ add_library(Vehicle
 	ComponentInformationCache.h
 	ComponentInformationManager.cc
 	ComponentInformationManager.h
+	EventHandler.cc
+	EventHandler.h
 	FTPManager.cc
 	FTPManager.h
 	GPSRTKFactGroup.cc
 	GPSRTKFactGroup.h
+	HealthAndArmingChecks.cc
+	HealthAndArmingChecks.h
 	InitialConnectStateMachine.cc
 	InitialConnectStateMachine.h
 	MAVLinkLogManager.cc
@@ -88,6 +94,8 @@ target_link_libraries(Vehicle
 	PRIVATE
 		ui
 		compression
+		libevents_generated
+		libevents_parser
 	PUBLIC
 		qgc
 )
diff --git a/src/comm/CMakeLists.txt b/src/comm/CMakeLists.txt
index b13077e..c4d3315 100644
--- a/src/comm/CMakeLists.txt
+++ b/src/comm/CMakeLists.txt
@@ -43,9 +43,8 @@ add_library(comm
 )
 
 target_link_libraries(comm
-	PRIVATE
-		qgc
 	PUBLIC
+		qgc
 		Qt5::Location
 		Qt5::SerialPort
 		Qt5::Test