--- a/python/storage.py	Thu Feb 10 22:41:38 2011 -0500
+++ b/python/storage.py	Fri Feb 25 14:25:34 2011 -0500
@@ -34,6 +34,12 @@
                                   timeInterval = moving.TimeInterval(firstFrameNum, lastFrameNum), 
                                   positions = moving.Trajectory([[float(numbers[6])],[float(numbers[7])]]), 
                                   userType = int(numbers[10]))
+        obj.userType = int(numbers[10])
+        obj.laneNums = [int(numbers[13])]
+        obj.precedingVehicles = [int(numbers[14])] # lead vehicle (before)
+        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.speeds = [float(numbers[11])]
         obj.size = [float(numbers[8]), float(numbers[9])] # 8 lengh, 9 width # TODO: temporary, should use a geometry object
@@ -56,10 +62,14 @@
                 break
             obj = createObject(numbers)
         else:
-            print(numbers[6])
             obj.positions.addPositionXY(float(numbers[6]), float(numbers[7]))
             obj.curvilinearPositions.addPositionXY(float(numbers[5]), float(numbers[4]))
             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]))
+            obj.timeHeadways.append(float(numbers[17]))
 
             if (obj.size[0] != float(numbers[8])):
                 print 'changed length obj %d' % (f.num)