Added common.py + some work done on Tracking keypoints