Added support for timestamps; implemented tracks, this still needs some work and some test cases.