--- a/include/Feature.hpp	Wed Aug 17 02:44:28 2011 -0400
+++ b/include/Feature.hpp	Wed Aug 17 17:14:00 2011 -0400
@@ -1,16 +1,22 @@
 #ifndef FEATURE_HPP
 #define FEATURE_HPP
 
-#include "opencv/cv.h"
+#include "opencv2/core/core.hpp"
 
 #include "src/Trajectory.h"
 
-class Feature {
+class FeatureTrajectory {
+
+  void addPoint(const int& frameNum, const cv::Point2f& p);
 
 protected:
-  int id;
-  int firstInstant;
-  Trajectory<cv::Point2f> trajectory;
+  Trajectory<cv::Point2f> positions;
+  Trajectory<cv::Point2f> velocities;
+  
+  std::vector<float> displacementDistances;
+
+  void computeMotionData(const int& frameNum);
+
 };
 
 #endif