Tracking

Please review. The tracking algorithm has been updated and finalized for this sprint. (Issue #11)