Initial implementation of tracking