Index: src/lib/math/curve.h
===================================================================
--- src/lib/math/curve.h	(revision 10582)
+++ src/lib/math/curve.h	(working copy)
@@ -71,7 +71,6 @@
   Curve*                dirCurve;        //!< The derivation-curve of this Curve.
 
   std::list<PathNode>   nodeList;        //!< A list of all the Nodes of a Curve.
-  std::list<PathNode>::iterator   nodeIterator;    //!< An iterator that should point to the current Node
   PathNode*             firstNode;       //!< First node of the curve.
   PathNode*             currentNode;     //!< The node we are working with (the Last node).
 
Index: src/world_entities/world_entity.cc
===================================================================
--- src/world_entities/world_entity.cc	(revision 10582)
+++ src/world_entities/world_entity.cc	(working copy)
@@ -184,9 +184,9 @@
 void WorldEntity::addTrack(const TiXmlElement* root)
 {
   // The problem we have is most likely here. The track should be constructed WITH the XML-Code
-/*  this->entityTrack = new Track(root);
+  this->entityTrack = new Track(root);
   this->setParent(this->entityTrack->getTrackNode());
-  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);*/
+  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
   /*LOAD_PARAM_START_CYCLE(root, element);
   {
     PRINTF(4)("element is: %s\n", element->Value());
@@ -199,8 +199,8 @@
 
 void WorldEntity::pauseTrack(bool stop)
 {
-/*     if(this->entityTrack)
-       this->entityTrack->pauseTrack(stop);*/ 
+     if(this->entityTrack)
+       this->entityTrack->pauseTrack(stop);
 }
 
 
Index: src/world_entities/test_entity.cc
===================================================================
--- src/world_entities/test_entity.cc	(revision 10582)
+++ src/world_entities/test_entity.cc	(working copy)
@@ -85,8 +85,8 @@
   this->toList(OM_GROUP_00);
 
  //add to track
-//   if(this->entityTrack)
-//     this->setParent(this->entityTrack->getTrackNode());
+  if(this->entityTrack)
+    this->setParent(this->entityTrack->getTrackNode());
 
 }
 
@@ -137,8 +137,8 @@
   glPopAttrib();
 
 
-// if( this->entityTrack != NULL)
-//     this->entityTrack->drawGraph();
+if( this->entityTrack != NULL)
+    this->entityTrack->drawGraph();
 
 }
 
@@ -147,8 +147,8 @@
  */
 void TestEntity::tick (float time)
 {
-//  if(this->entityTrack)
-//     this->entityTrack->tick(time);
+ if(this->entityTrack)
+    this->entityTrack->tick(time);
 
 
 }
Index: src/world_entities/space_ships/space_ship.cc
===================================================================
--- src/world_entities/space_ships/space_ship.cc	(revision 10582)
+++ src/world_entities/space_ships/space_ship.cc	(working copy)
@@ -493,8 +493,8 @@
 */
 void SpaceShip::draw () const
 {
-//   if( this->entityTrack != NULL && this->isDrawTrack())
-//     this->entityTrack->drawGraph();
+  if( this->entityTrack != NULL && this->isDrawTrack())
+    this->entityTrack->drawGraph();
 
   WorldEntity::draw();
 
@@ -550,8 +550,8 @@
     this->secWeaponMan.releaseFire();
 
   // Tracktick
-//   if(this->entityTrack)
-//     this->entityTrack->tick(time);
+  if(this->entityTrack)
+    this->entityTrack->tick(time);
 
 
   // Shield Regeneration and other regular calculations on the ship
@@ -867,8 +867,8 @@
 
         this->isTravelDistanceInit = false;
 
-//         if(this->entityTrack)
-//            this->travelNode->setParent(this->entityTrack->getTrackNode());
+        if(this->entityTrack)
+           this->travelNode->setParent(this->entityTrack->getTrackNode());
 
         this->setParent(this->travelNode);
         this->setRelCoor(0,0,0);
Index: src/world_entities/npcs/npc.cc
===================================================================
--- src/world_entities/npcs/npc.cc	(revision 10582)
+++ src/world_entities/npcs/npc.cc	(working copy)
@@ -152,7 +152,7 @@
   this->bFire = false;
   if( this->entityTrack)
   {
-/*      this->setParent(this->entityTrack->getTrackNode());*/
+      this->setParent(this->entityTrack->getTrackNode());
       this->setRelCoor(0,0,0);
   }
 
@@ -426,15 +426,15 @@
   }
   this->bFire = false;
 
-//  if(this->entityTrack)
-//     this->entityTrack->tick(dt);
+ if(this->entityTrack)
+    this->entityTrack->tick(dt);
 
 }
 
 void NPC::draw() const
 {
-//  if( this->entityTrack != NULL && this->isDrawTrack())
-//   this->entityTrack->drawGraph();
+ if( this->entityTrack != NULL && this->isDrawTrack())
+  this->entityTrack->drawGraph();
 
  WorldEntity::draw();
 }
Index: src/world_entities/camera.cc
===================================================================
--- src/world_entities/camera.cc	(revision 10582)
+++ src/world_entities/camera.cc	(working copy)
@@ -101,11 +101,11 @@
   this->eventHandling = true;
 
   //add to track
-/*  if(this->entityTrack)
+  if(this->entityTrack)
    {
     this->setParent(this->entityTrack->getTrackNode());
     //this->setRelCoor(0,0,0);
-   }*/
+   }
 }
 
 /**
@@ -226,7 +226,7 @@
   if(this->entityTrack)
   {
     //PRINTF(0)("tickytackytucky\n");
-/*    this->entityTrack->tick(dt);*/
+    this->entityTrack->tick(dt);
     //this->setAbsCoor(this->entityTrack->getTrackNode()->getAbsCoor());
   } 
 
@@ -239,8 +239,8 @@
 
 void Camera::draw() const
 {
-/*  if( this->entityTrack != NULL && this->isDrawTrack())
-    this->entityTrack->drawGraph();*/
+  if( this->entityTrack != NULL && this->isDrawTrack())
+    this->entityTrack->drawGraph();
 }
 
 
Index: src/util/Makefile.am
===================================================================
--- src/util/Makefile.am	(revision 10582)
+++ src/util/Makefile.am	(working copy)
@@ -23,7 +23,12 @@
 			\
 			animation/animation3d.cc \
 			animation/animation.cc \
-			animation/animation_player.cc
+			animation/animation_player.cc \
+			\
+			track/pilot_node.cc \
+			track/track.cc \
+			track/track_manager.cc \
+			track/track_node.cc
 
 noinst_HEADERS =        \
 			object_manager.h \
@@ -44,4 +49,10 @@
 			animation/animation3d.h \
 			animation/animation.h \
 			animation/animation_player.h \
-			animation/t_animation.h
+			animation/t_animation.h \
+			\
+			track/pilot_node.h \
+			track/track.h \
+			track/track_manager.h \
+			track/track_node.h
+