--- a/python/storage.py	Thu May 23 17:57:11 2013 +0200
+++ b/python/storage.py	Wed Jun 12 17:28:34 2013 -0400
@@ -220,7 +220,7 @@
         obj.followingVehicles = [int(numbers[15])] # following vehicle (after)
         obj.spaceHeadways = [float(numbers[16])] # feet
         obj.timeHeadways = [float(numbers[17])] # seconds
-        obj.curvilinearPositions = moving.Trajectory([[float(numbers[5])],[float(numbers[4])]]) # X is the longitudinal coordinate
+        obj.curvilinearPositions = moving.CurvilinearTrajectory([float(numbers[5])],[float(numbers[4])], obj.laneNums) # X is the longitudinal coordinate
         obj.speeds = [float(numbers[11])]
         obj.size = [float(numbers[8]), float(numbers[9])] # 8 lengh, 9 width # TODO: temporary, should use a geometry object
         return obj
@@ -242,10 +242,10 @@
                 break
             obj = createObject(numbers)
         else:
+            obj.laneNums.append(int(numbers[13]))
             obj.positions.addPositionXY(float(numbers[6]), float(numbers[7]))
-            obj.curvilinearPositions.addPositionXY(float(numbers[5]), float(numbers[4]))
+            obj.curvilinearPositions.addPosition(float(numbers[5]), float(numbers[4]), obj.laneNums[-1])
             obj.speeds.append(float(numbers[11]))
-            obj.laneNums.append(int(numbers[13]))
             obj.precedingVehicles.append(int(numbers[14]))
             obj.followingVehicles.append(int(numbers[15]))
             obj.spaceHeadways.append(float(numbers[16]))