Implemented a simple Track2 implementation
Merge branch 'track2'