diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 147347f..a274d71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(PROTO_FILES
 
 # generate the Protobuf C++ files
 SET(PROTO_SOURCE_FILES "")
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ProtobufCompile("${PROTO_FILES}" PROTO_SOURCE_FILES)
 
 SET(SOURCE_FILES
@@ -29,6 +30,12 @@ SET(SOURCE_FILES
     stdafx.h
 )
 
+SET(SOURCE_COM_FILES
+    com/AircraftReporter.cpp
+    com/ZmqContext.cpp
+    com/ZmqContext.h
+)
+
 SET(SOURCE_CONFIG_FILES
     config/CommunicationFileFormat.cpp
     config/FileFormat.cpp
@@ -41,6 +48,10 @@ SET(SOURCE_FILES_RES
     ${CMAKE_SOURCE_DIR}/res/targetver.h
 )
 
+SET(INCLUDE_COM_FILES
+    ${CMAKE_SOURCE_DIR}/include/aman/com/AircraftReporter.h
+)
+
 SET(INCLUDE_CONFIG_FILES
     ${CMAKE_SOURCE_DIR}/include/aman/config/CommunicationFileFormat.h
     ${CMAKE_SOURCE_DIR}/include/aman/config/FileFormat.h
@@ -59,10 +70,12 @@ SET(INCLUDE_TYPES_FILES
 ADD_LIBRARY(
     ArrivalMANager SHARED
         ${SOURCE_FILES_RES}
+        ${SOURCE_COM_FILES}
         ${SOURCE_CONFIG_FILES}
         ${SOURCE_FILES}
         ${PROTO_SOURCE_FILES}
         ${PROTO_FILES}
+        ${INCLUDE_COM_FILES}
         ${INCLUDE_CONFIG_FILES}
         ${INCLUDE_HELPER_FILES}
         ${INCLUDE_TYPES_FILES}
@@ -70,8 +83,8 @@ ADD_LIBRARY(
 
 # define the dependencies
 TARGET_INCLUDE_DIRECTORIES(ArrivalMANager INTERFACE EuroScope)
-TARGET_LINK_LIBRARIES(ArrivalMANager EuroScope GSL Shlwapi.lib)
-TARGET_LINK_LIBRARIES(ArrivalMANager protobuf)
+TARGET_LINK_LIBRARIES(ArrivalMANager EuroScope GSL Shlwapi)
+TARGET_LINK_LIBRARIES(ArrivalMANager cppzmq protobuf)
 
 # configure the debugger and update the linker flags
 IF(MSVC)
@@ -89,8 +102,10 @@ ENDIF()
 SOURCE_GROUP("Generated Files" FILES ${PROTO_SOURCE_FILES})
 SOURCE_GROUP("Protocol Files" FILES ${PROTO_FILES})
 SOURCE_GROUP("Source Files" FILES ${SOURCE_FILES})
+SOURCE_GROUP("Source Files\\com" FILES ${SOURCE_COM_FILES})
 SOURCE_GROUP("Source Files\\config" FILES ${SOURCE_CONFIG_FILES})
 SOURCE_GROUP("Source Files\\res" FILES ${SOURCE_FILES_RES})
+SOURCE_GROUP("Header Files\\com" FILES ${INCLUDE_COM_FILES})
 SOURCE_GROUP("Header Files\\config" FILES ${INCLUDE_CONFIG_FILES})
 SOURCE_GROUP("Header Files\\helper" FILES ${INCLUDE_HELPER_FILES})
 SOURCE_GROUP("Header Files\\types" FILES ${INCLUDE_TYPES_FILES})