diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6e5679..5227c07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ include_directories(
 
 ament_auto_add_library(autoware_v2x SHARED
   src/v2x_node.cpp
+  src/v2x_app.cpp
   src/application.cpp
   src/cpm_application.cpp
   src/ethernet_device.cpp
diff --git a/include/autoware_v2x/v2x_app.hpp b/include/autoware_v2x/v2x_app.hpp
new file mode 100644
index 0000000..8a66e2d
--- /dev/null
+++ b/include/autoware_v2x/v2x_app.hpp
@@ -0,0 +1,38 @@
+#ifndef V2X_APP_HPP_EUIC2VFR
+#define V2X_APP_HPP_EUIC2VFR
+
+#include "rclcpp/rclcpp.hpp"
+#include "std_msgs/msg/string.hpp"
+#include "autoware_perception_msgs/msg/dynamic_object_array.hpp"
+#include "tf2_msgs/msg/tf_message.hpp"
+#include <boost/asio/io_service.hpp>
+#include "autoware_v2x/cpm_application.hpp"
+#include "autoware_v2x/time_trigger.hpp"
+#include "autoware_v2x/link_layer.hpp"
+#include "autoware_v2x/ethernet_device.hpp"
+#include "autoware_v2x/positioning.hpp"
+#include "autoware_v2x/security.hpp"
+#include "autoware_v2x/router_context.hpp"
+
+namespace v2x
+{
+  class V2XApp
+  {
+  public:
+    V2XApp(rclcpp::Node*);
+    void start();
+    void objectsCallback(const autoware_perception_msgs::msg::DynamicObjectArray::ConstSharedPtr);
+    void tfCallback(const tf2_msgs::msg::TFMessage::ConstSharedPtr);
+
+    CpmApplication *cp;
+
+  private:
+    friend class CpmApplication;
+    friend class Application;
+    rclcpp::Node* node_;
+    bool tf_received_;
+    bool cp_started_;
+  };
+}
+
+#endif
\ No newline at end of file
diff --git a/src/v2x_app.cpp b/src/v2x_app.cpp
new file mode 100644
index 0000000..a6d9fdc
--- /dev/null
+++ b/src/v2x_app.cpp
@@ -0,0 +1,185 @@
+#include "autoware_v2x/v2x_app.hpp"
+#include "autoware_v2x/time_trigger.hpp"
+#include "autoware_v2x/router_context.hpp"
+#include "autoware_v2x/positioning.hpp"
+#include "autoware_v2x/security.hpp"
+#include "autoware_v2x/link_layer.hpp"
+#include "autoware_v2x/cpm_application.hpp"
+
+#include "rclcpp/rclcpp.hpp"
+#include "std_msgs/msg/string.hpp"
+
+#include "tf2/LinearMath/Quaternion.h"
+#include "tf2/LinearMath/Matrix3x3.h"
+
+#include <vanetza/asn1/cpm.hpp>
+#include <vanetza/facilities/cpm_functions.hpp>
+#include <sstream>
+#include <memory>
+#include <GeographicLib/UTMUPS.hpp>
+#include <GeographicLib/MGRS.hpp>
+#include <boost/thread.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace gn = vanetza::geonet;
+
+using namespace vanetza;
+using namespace vanetza::facilities;
+using namespace std::chrono;
+
+namespace v2x
+{
+  V2XApp::V2XApp(rclcpp::Node *node) : 
+    node_(node),
+    tf_received_(false),
+    cp_started_(false)
+    // io_service_(),
+    // trigger_(io_service_),
+    // runtime_(new Runtime(Clock::at(boost::posix_time::microsec_clock::universal_time()))),
+    // device_name_("wlp4s0"),
+    // device_(device_name_),
+    // mac_address_(device_.address()),
+    // link_layer_(create_link_layer(io_service_, device_, "ethernet")),
+    // positioning_(create_position_provider(io_service_, trigger_.runtime())),
+    // security_(create_security_entity(trigger_.runtime(), *positioning_)),
+    // mib_(),
+    // cp_(new CpmApplication(node_, trigger_.runtime())),
+    // context_(mib_, trigger_, *positioning_, security_.get()),
+    // app_()
+  {
+
+    // device_name_ = "wlp4s0";
+    // device_(device_name_);
+    // mac_address_ = device_.address();
+
+    // std::stringstream sout;
+    // sout << mac_address_;
+    // RCLCPP_INFO(node_->get_logger(), "MAC Address: '%s'", sout.str().c_str());
+
+    // trigger_(io_service_);
+
+    // link_layer_ = create_link_layer(io_service_, device_, "ethernet");
+    // mib_.itsGnLocalGnAddr.mid(mac_address_);
+    // mib_.itsGnLocalGnAddr.is_manually_configured(true);
+    // mib_.itsGnLocalAddrConfMethod = geonet::AddrConfMethod::Managed;
+    // mib_.itsGnSecurity = false;
+    // mib_.itsGnProtocolVersion = 1;
+
+    // context_(mib_, trigger_, *positioning_, security_.get()),
+    // context_.router_.set_address(mib_.itsGnLocalGnAddr);
+    // context_.updateMIB(mib_);
+
+    // positioning_ = create_position_provider(io_service_, trigger_.runtime());
+    // security_ = create_security_entity(trigger_.runtime(), *positioning_);
+
+    // RouterContext context_(mib_, trigger_, *positioning_, security_.get());
+    // RouterContext context_(mib_, trigger_, *positioning_, security_.get());
+    // context_.set_link_layer(link_layer_.get());
+
+    // std::unique_ptr<CpmApplication> cp_ { new CpmApplication(this) };
+    // app_ = std::move(cp_);
+
+    // context_.enable(cp_.get());
+
+
+    // io_service_.run();
+    // boost::thread(boost::bind(&boost::asio::io_service::run, &io_service_));
+
+    // // Print MAC Address to logger
+    // std::stringstream sout;
+    // sout << mac_address;
+    // RCLCPP_INFO(get_logger(), "MAC Address: '%s'", sout.str().c_str());
+  }
+
+  void V2XApp::objectsCallback(const autoware_perception_msgs::msg::DynamicObjectArray::ConstSharedPtr msg) {
+    RCLCPP_INFO(node_->get_logger(), "V2XApp: msg received");
+    if (tf_received_) {
+      cp->updateObjectsStack(msg);
+    }
+  }
+
+  void V2XApp::tfCallback(const tf2_msgs::msg::TFMessage::ConstSharedPtr msg) {
+    RCLCPP_INFO(node_->get_logger(), "V2XApp: tf msg received");
+    tf_received_ = true;
+
+    double x = msg->transforms[0].transform.translation.x;
+    double y = msg->transforms[0].transform.translation.y;
+    double z = msg->transforms[0].transform.translation.z;
+    int timestamp = msg->transforms[0].header.stamp.sec;
+    int gdt = timestamp % 65536;
+
+    double rot_x = msg->transforms[0].transform.rotation.x;
+    double rot_y = msg->transforms[0].transform.rotation.y;
+    double rot_z = msg->transforms[0].transform.rotation.z;
+    double rot_w = msg->transforms[0].transform.rotation.w;
+
+    // Convert the quarternion to euler (yaw, pitch, roll)
+    tf2::Quaternion quat(rot_x, rot_y, rot_z, rot_w);
+    tf2::Matrix3x3 matrix(quat);
+    double roll, pitch, yaw;
+    matrix.getRPY(roll, pitch, yaw);
+
+
+    char mgrs[20];
+    int zone, prec;
+    bool northp;
+    double x_mgrs, y_mgrs;
+    double lat, lon;
+    sprintf(mgrs, "54SVE%.5d%.5d", (int)x, (int)y);
+    RCLCPP_INFO(node_->get_logger(), "MGRS: %s", mgrs);
+
+    GeographicLib::MGRS::Reverse(mgrs, zone, northp, x_mgrs, y_mgrs, prec);
+    GeographicLib::UTMUPS::Reverse(zone, northp, x_mgrs, y_mgrs, lat, lon);
+
+    RCLCPP_INFO(node_->get_logger(), "Ego Position Lat/Lon: %f, %f", lat, lon);
+    RCLCPP_INFO(node_->get_logger(), "Ego Orientation: %f, %f, %f, %f", rot_x, rot_y, rot_z, rot_w);
+    RCLCPP_INFO(node_->get_logger(), "Ego Orientation: %f %f %f", roll, pitch, yaw);
+    RCLCPP_INFO(node_->get_logger(), "Timestamp: %d, GDT: %d", timestamp, gdt);
+
+    if (cp && cp_started_) {
+      cp->updateMGRS(&x, &y);
+      cp->updateRP(&lat, &lon, &z);
+      cp->updateHeading(&yaw);
+      cp->updateGenerationDeltaTime(&gdt);
+    }
+  }
+
+  void V2XApp::start() {
+    RCLCPP_INFO(node_->get_logger(), "V2X App Launched");
+
+    boost::asio::io_service io_service;
+    TimeTrigger trigger(io_service);
+
+    const char* device_name = "wlp4s0";
+    EthernetDevice device(device_name);
+    vanetza::MacAddress mac_address = device.address();
+
+    std::stringstream sout;
+    sout << mac_address;
+    RCLCPP_INFO(node_->get_logger(), "MAC Address: '%s'", sout.str().c_str());
+
+    gn::MIB mib;
+    mib.itsGnLocalGnAddr.mid(mac_address);
+    mib.itsGnLocalGnAddr.is_manually_configured(true);
+    mib.itsGnLocalAddrConfMethod = geonet::AddrConfMethod::Managed;
+    mib.itsGnSecurity = false;
+    mib.itsGnProtocolVersion = 1;
+
+    // context_.updateMIB(mib_);
+    auto link_layer =  create_link_layer(io_service, device, "ethernet");
+    auto positioning = create_position_provider(io_service, trigger.runtime());
+    auto security = create_security_entity(trigger.runtime(), *positioning);
+    RouterContext context(mib, trigger, *positioning, security.get());
+
+    context.set_link_layer(link_layer.get());
+
+    cp = new CpmApplication(node_, trigger.runtime());
+
+    // context.enable(cp_.get());
+    context.enable(cp);
+
+    cp_started_ = true;
+
+    io_service.run();
+  }
+}
\ No newline at end of file