diff --git a/src/modules/mc_pos_control/TranslationControl.cpp b/src/modules/mc_pos_control/TranslationControl.cpp
new file mode 100644
index 0000000000..b5405529e1
--- /dev/null
+++ b/src/modules/mc_pos_control/TranslationControl.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2017 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file TranslationControl.cpp
+ *
+ */
+
+#include "TranslationControl.hpp"
+#include <float.h>
+#include <mathlib/mathlib.h>
+
+using namespace matrix;
+
+using Data = matrix::Vector3f;
+
+TranslationControl::TranslationControl()
+{
+
+};
+
+void TranslationControl::updateState(struct vehicle_local_position_s state)
+{
+	_pos = Data(&state.x);
+	_vel = Data(&state.vx);
+	_pos.print();
+}
+
+void TranslationControl::updateSetpoint(struct vehicle_local_position_setpoint_s setpoint)
+{
+	_pos_sp = Data(&setpoint.x);
+	_vel_sp = Data(&setpoint.vx);
+	_acc_sp = Data(&setpoint.acc_x);
+	_yaw_sp = setpoint.yaw;
+	_yawspeed_sp = setpoint.yawspeed;
+}
diff --git a/src/modules/mc_pos_control/TranslationControl.hpp b/src/modules/mc_pos_control/TranslationControl.hpp
new file mode 100644
index 0000000000..2893b6ce76
--- /dev/null
+++ b/src/modules/mc_pos_control/TranslationControl.hpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2017 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file TranslationControl.hpp
+ *
+ * @inputs: position-, velocity-, acceleration-, thrust- setpoints
+ * @outputs: thrust vector
+ *
+ */
+
+#include <matrix/matrix/math.hpp>
+
+#include <uORB/topics/vehicle_local_position.h>
+#include <uORB/topics/vehicle_local_position_setpoint.h>
+
+#pragma once
+
+class TranslationControl
+{
+public:
+	TranslationControl();
+
+	~TranslationControl() {};
+
+	void updateState(struct vehicle_local_position_s state);
+	void updateSetpoint(struct vehicle_local_position_setpoint_s setpoint);
+
+private:
+
+	matrix::Vector3f _pos{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _vel{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _acc{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _thr{0.0f, 0.0f, 0.0f};
+	float _yaw{0.0f};
+
+	matrix::Vector3f _pos_sp{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _vel_sp{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _acc_sp{0.0f, 0.0f, 0.0f};
+	matrix::Vector3f _thr_sp{0.0f, 0.0f, 0.0f};
+	float _yaw_sp{0.0f};
+	float _yawspeed_sp{0.0f};
+};