diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 5f6b036..a246c5f 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -138,22 +138,13 @@ namespace Entities
 
     void Entity::stop()
     {
-        try {
         
         PodController_->stopAllPods();
         LOG_S(INFO)<<"Pods stoppt";
         stopChild();
         LOG_S(INFO)<<"childs stoppt";
         
-        // MovemtServer_.reset();
-        LOG_S(INFO)<<"MovemtServer_ reseted";
-
-        stopMainLoop = true;
-
-        // BroadcastServer_.reset();
-        LOG_S(INFO)<<"BroadcastServer_ reseted";
-
-
+    
 
         for (std::vector<std::thread>::iterator it = threads.begin(); it != threads.end();)
         {
@@ -170,9 +161,7 @@ namespace Entities
         // std::this_thread::sleep_for(std::chrono::milliseconds(30000));
 
         // exit(0);
-        } catch (const std::exception e) {
-            LOG_S(ERROR)<< e.what();
-        }
+        
     }
 
     void Entity::startMovementWorker()
@@ -221,7 +210,6 @@ namespace Entities
                 if (newTrack != nullptr) 
                 {
                     OwnShipTrack->setPosition(newTrack->getPosition());
-                    // LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
                 }
             }
 
@@ -287,7 +275,18 @@ namespace Entities
                 
                 break;
                }
-            }
+               case Orders::SYSTEM_STATE_REQUEST:
+                {
+                
+                break;
+               }
+               case Orders::TRACKLIST_REQUEST:
+                {
+                
+                break;
+               }
+                 break;
+               }
             break;
 
         }
@@ -317,7 +316,6 @@ namespace Entities
                {
                 nlohmann::json j;
                 this->TrackList_->getJsonTRackList(j);
-                // WHISPER::StringData(this->OwnShipTrack->getIdentifier(),) 
                 this->CommandCommsServer_->sendMessage(j.dump());
                 break;
                }
@@ -339,12 +337,7 @@ namespace Entities
          } catch (std::exception &e) {
             LOG_S(ERROR)<<e.what();
         }
-        
-
-
-    //    LOG_S(INFO)<<"sending";
-    //    CommandCommsServer_->sendMessage(this->OwnShipTrack->buildMessage().serialize());
-
+    
     }