diff --git a/include/Entities/Entity.hpp b/include/Entities/Entity.hpp
index 66d4d36..b0ca153 100644
--- a/include/Entities/Entity.hpp
+++ b/include/Entities/Entity.hpp
@@ -68,7 +68,7 @@ namespace Entities {
             virtual void specificPhysicsCalculations(std::chrono::milliseconds::rep duration) = 0;
             virtual void specificReloadCharacteristicts() = 0;
 
-            Entities::Movement Movement_;
+            std::unique_ptr<Entities::Movement> Movement_;
 
         private:
 
diff --git a/include/Entities/Movement.hpp b/include/Entities/Movement.hpp
index bbf7a40..01d1c5d 100644
--- a/include/Entities/Movement.hpp
+++ b/include/Entities/Movement.hpp
@@ -36,6 +36,8 @@ namespace Entities
 
             void updatePosition(double dt);
 
+            void updatePositionSimple(double dt);
+
 
             /**
             * @brief returns the current Course representing the direction the front of the entity is pointing 
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 4c6f40c..8746fd7 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -104,7 +104,7 @@ namespace Entities
     auto end = std::chrono::steady_clock::now();
     std::chrono::milliseconds::rep duration =  std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
 
-    Movement_.updatePosition(duration);
+    Movement_->updatePosition(duration);
 
 
     specificPhysicsCalculations(duration);
diff --git a/src/Entities/Movement.cpp b/src/Entities/Movement.cpp
index a458fd6..aa6c27e 100644
--- a/src/Entities/Movement.cpp
+++ b/src/Entities/Movement.cpp
@@ -97,6 +97,14 @@ namespace Entities
 
     }
 
+
+    void Movement::updatePositionSimple(double dt)
+    {
+
+        
+    }
+
+
     Eigen::Vector3d  Movement::getKinematicVector()
     {
 
diff --git a/src/Entities/Tracklist/Tracklist.cpp b/src/Entities/Tracklist/Tracklist.cpp
index c26b34b..78480a9 100644
--- a/src/Entities/Tracklist/Tracklist.cpp
+++ b/src/Entities/Tracklist/Tracklist.cpp
@@ -1,4 +1,3 @@
-
 #include <Entities/Tracklist/Tracklist.hpp>
 // #include <Entities/Tracklist/TracklistItem.hpp>
 // #include <SimCore/SimCore.hpp>
@@ -89,7 +88,8 @@ namespace TrackList
       std::lock_guard<std::mutex> lock(mutex_);
       
       auto item = std::make_shared<TracklistItem>( track, sensorData);
-      TrackList_.emplace(track->getIdentifier().serialize(),item);
+      std::string id = track->getIdentifier().serialize();
+      TrackList_.emplace(id,item);
     }