restored track functions from refactor
merge fixes
merge fixes
Merge pull request #49 from dyoachim/tracks

Tracks